Dan Lake
79327a6299
Merge branch 'master' into sceneapi
2010-04-20 11:43:03 -07:00
Dan Lake
031bc35c06
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-04-20 11:42:47 -07:00
Dan Lake
bcce66ad1f
Eliminate region archive passing
2010-04-20 11:42:23 -07:00
Dan Lake
6236d24d14
Added required SceneAPI messages
2010-04-20 11:40:25 -07:00
Justin Clark-Casey (justincc)
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
Justin Clark-Casey (justincc)
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc)
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
Justin Clark-Casey (justincc)
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
Justin Clark-Casey (justincc)
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
Melanie Thielker
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
Melanie
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
Melanie
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
Melanie Thielker
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
Melanie
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
Melanie
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
Justin Clark-Casey (justincc)
7ef6dc2bac
Slightly tweak README to account for the fact that first-time standalone users may effectively set up their avatar as 'master avatar' in the region configuration stage.
2010-04-18 21:31:54 +01:00
Diva Canto
4e1cbd1bf3
One more bug fix in sqlite sql statements.
2010-04-16 18:04:20 -07:00
Diva Canto
2597a3406c
Bug fix: UserAccounts in SQLite was missing the primary key constraint.
2010-04-16 17:43:15 -07:00
Diva Canto
930d374525
Expose Delete at IUserAccountData interface. It was there already. No changes in IUserAccountService, just the data layer.
2010-04-16 16:36:44 -07:00
Justin Clark-Casey (justincc)
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
Justin Clark-Casey (justincc)
ab3af43d5e
refactor: remove now unused internal method SendAttachEvent()
2010-04-16 23:29:36 +01:00
Justin Clark-Casey (justincc)
cac12eca79
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-16 23:24:34 +01:00
Justin Clark-Casey (justincc)
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
Diva Canto
b3e9dd4fc2
Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL statements.
2010-04-16 15:10:57 -07:00
Justin Clark-Casey (justincc)
45563e20e0
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
2010-04-16 22:57:44 +01:00
Justin Clark-Casey (justincc)
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
Justin Clark-Casey (justincc)
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
Justin Clark-Casey (justincc)
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
Justin Clark-Casey (justincc)
cf46735856
add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
...
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
Justin Clark-Casey (justincc)
5459a90fc6
minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place
2010-04-16 21:23:01 +01:00
Justin Clark-Casey (justincc)
9131a0d4a4
minor: stop datasnapshot issuing a warning log message if it's disabled
2010-04-16 21:12:09 +01:00
Justin Clark-Casey (justincc)
48f3733963
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
John Hurliman
a7449a82bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 19:49:02 -07:00
John Hurliman
8fa13e3871
Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene
2010-04-14 19:48:40 -07:00
Diva Canto
a7aab6af0c
This version of the launcher exe works.
2010-04-14 19:39:27 -07:00
Diva Canto
ff50a90a83
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-04-14 19:23:17 -07:00
Diva Canto
407b48f3bb
The missing .csproj for the Robust 32 bit launcher
2010-04-14 19:22:48 -07:00
Justin Clark-Casey (justincc)
e0f8362e7a
minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums
2010-04-14 22:31:11 +01:00
John Hurliman
985faf4151
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 11:06:07 -07:00
John Hurliman
1e87fc8a26
Applying a patch from lkalif to fix a small bug in the previous patch
2010-04-14 11:05:28 -07:00
Diva Canto
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
John Hurliman
6892fc41f7
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
2010-04-13 18:59:05 -07:00
Robert Adams
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
dahlia
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
dahlia
56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
John Hurliman
3f6c4c150e
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
...
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
John Hurliman
542abb9c43
* Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
...
* Changing the SimianGrid asset service connector to match the corrected documentation
2010-04-07 09:58:16 -07:00
Diva Canto
5fc9fe70af
Added NullInventoryData for unit tests and quick try-outs of the services in 64-bit machines (no SQLite).
2010-04-06 19:38:01 -07:00
Diva Canto
80346ad2e2
* May fix mantis #4603 .
...
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
John Hurliman
f302224caf
* In the async asset fetch method, cache check before firing any async code. This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard
2010-04-05 14:52:25 -07:00