Commit Graph

14435 Commits (12ebed8babf4c50753fde55eb6f4dccd57b020a1)

Author SHA1 Message Date
Tom Grimshaw 8dc7c0849e The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets. 2010-06-29 23:18:48 -07:00
Justin Clark-Casey (justincc) 5925aac859 Add --merge switch to load iar.
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
Justin Clark-Casey (justincc) be0af01061 Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
This reverts commit 94cb6fc916.
2010-06-29 23:43:38 +01:00
Melanie 714367efb9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 21:51:56 +01:00
Diva Canto d06b977ed1 Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure. 2010-06-29 14:21:48 -07:00
Melanie 6701fc2ffa Fix the XML serializationt to provide an empty script state element if
the script hasn't yet saved state, or can't save state because of a loop
2010-06-29 21:50:52 +01:00
Melanie 5d11833ae1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 20:36:36 +01:00
Justin Clark-Casey (justincc) 94cb6fc916 stop exceptions in setting and getting state from propogating since they aren't fatal to operations
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
Melanie 5964084d25 Fix a nullref on autoreturn 2010-06-29 20:36:17 +01:00
Justin Clark-Casey (justincc) c607e6f3b8 Revert "don't report the null uuid as a missing asset on saving oars/iars"
This reverts commit 5ce119174e.

This change led to infinite timeout since the expected number of assets no longer matched requests.
Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
2010-06-29 20:30:22 +01:00
Diva Canto cf15558c9e This file wants to be committed. 2010-06-29 06:25:12 -07:00
Diva Canto fa3f448324 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-29 04:40:02 -07:00
Diva Canto 08e3389790 Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". 2010-06-29 04:38:15 -07:00
Diva Canto 9fde9085a0 Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule. 2010-06-29 02:07:10 -07:00
Melanie Thielker 3cd717d929 Comment the "Notecard saved" notification that pops up when a notecard
is saved into a prim. Sl doesn't have it, and for good reason: It also
happens on scripts in our version. Which is wrong. Better no message
than a wrong one.
2010-06-29 04:09:14 +02:00
Melanie Thielker 6f4d4543b9 Make newly created prims be named "Object" and make newly created scripts
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
dahlia 621195e4f1 Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return correct rotations for a 180 degree angle between vectors
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-06-28 17:33:47 -07:00
Diva Canto d123350164 One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated. 2010-06-28 16:04:12 -07:00
Diva Canto 20fc35399b Fixes mantis #4815 and #4812 2010-06-28 14:10:22 -07:00
Tom Grimshaw 06fa038875 Return a UUID.Zero if the asset fails to upload 2010-06-28 07:09:05 -07:00
Tom Grimshaw a5a1df68c2 Provide the interface for StoreAsset to report success or failure 2010-06-28 04:02:33 -07:00
Melanie Thielker 3e908023b2 Force IM timestamps to current server time to prevent "Saved on" headers
while the sender is online
2010-06-28 08:58:51 +02:00
Tom Grimshaw 7807d11807 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-27 22:23:08 -07:00
Tom Grimshaw 827d9be48f Fix the sound issue. It was caused by missing assets; once the client has made one request, it continued to wait for asset before requesting any new ones, until the TransferRequest timed out. Fixed by adding a TransferAbortPacket if the asset cannot be retrieved. 2010-06-27 22:23:01 -07:00
Melanie Thielker 0a82d10fc4 Change the way IRegionModule us referenced by IEmailModule to
allow later conversion to new style
2010-06-28 03:14:05 +01:00
Melanie Thielker 85a9c305a2 Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:43:26 +01:00
Melanie Thielker 4cdda2cae9 Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:36:40 +01:00
Melanie Thielker 4fa1d4896c Change the way IRegionModule us referenced by IEmailModule to
allow later conversion to new style
2010-06-28 02:30:36 +02:00
Melanie Thielker a817f6b48c Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:48:24 +02:00
Melanie Thielker d570cffa39 Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:29:30 +02:00
Melanie 1499fd85c4 Fix a simian compiler warning 2010-06-27 21:02:03 +01:00
Melanie Thielker 660a560d3b Make drag copy and copy-on-ray handle friends list perms properly 2010-06-27 20:59:51 +01:00
Robert Adams 6cf0b8f6fe Add command-script to the Robust console 2010-06-27 13:28:27 -07:00
Diva Canto 3dbc736049 Addresses mantis #4789. Not really a fix, because the event is harmless anyway. Just shouldn't happen normally. 2010-06-27 13:23:51 -07:00
Diva Canto a61d817978 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-27 13:07:44 -07:00
Diva Canto 7868f1f650 Fixed Robust.32BitLaunch.exe 2010-06-27 13:06:39 -07:00
Diva Canto 76d2f0f68e Same patch as before but for SQLite. 2010-06-27 12:40:17 -07:00
Diva Canto b0129b35f8 Added checks to XInventory DB layer to truncate names and descriptions. 2010-06-27 12:37:16 -07:00
Melanie 3612a5252b Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:23:33 +01:00
Melanie 121ba7e95c Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-27 20:05:29 +01:00
Melanie Thielker 2cced72d70 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-27 21:05:06 +02:00
Melanie 9c553cd254 Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:20:08 +01:00
Melanie ba38c697e8 Merge branch 'master' into careminster-presence-refactor 2010-06-27 20:05:55 +01:00
Melanie 205d2496f6 Fix permission propagation to prevent permanently locked objects from being
created.
2010-06-27 20:04:39 +01:00
Melanie Thielker 19f18c8a1b Make drag copy and copy-on-ray handle friends list perms properly 2010-06-27 21:04:30 +02:00
Tom Grimshaw ef0ac7c403 Deal with incoming land objects properly so they don't just stack up 2010-06-26 23:20:28 -07:00
Tom Grimshaw 9f00f141fe Restore "AllowCareminsterFunctions" as an alias to the new "AllowLightshareFunctions". 2010-06-26 18:54:55 -07:00
Tom Grimshaw 592ff1288d Add a new global event : OnTerrainUpdate 2010-06-26 18:51:19 -07:00
Tom Grimshaw c97e9f8621 Reverting the ITerrainModule changes. Turns out this was useless. 2010-06-26 18:43:01 -07:00
Tom Grimshaw 3bcee57e3e add HasChanged to ITerrainModule 2010-06-26 17:34:19 -07:00