Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-01 | 1 | -0/+8 |
|\ | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 |
| | | |||||
| * | Report asset upload success if it has previously failed | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-01 | 16 | -42/+170 |
| |\ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Catch newid == null which is what happens if the asset service is offline ↵ | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
| | | | | | | | | | | | | (seems a connection failure does not throw an exception) | ||||
* | | | Remove trailing slash from HTTP URLs to be compatible with SL | Melanie Thielker | 2010-07-01 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Avoid a spurious error message when taking a friend's no copy item | Melanie Thielker | 2010-07-01 | 2 | -11/+38 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 15 | -31/+132 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-30 | 2 | -31/+12 |
| |\ | |||||
| | * | Removed opportunity for exception in BaseHttpServer. (mantis #4825) | Diva Canto | 2010-06-30 | 1 | -0/+4 |
| | | | |||||
| | * | Revert "stop exceptions in setting and getting state from propogating since ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -31/+8 |
| | | | | | | | | | | | | | | | | | | they aren't fatal to operations" This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445. | ||||
| * | | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-29 | 1 | -1/+2 |
| |\ | |||||
| | * | Remove the override from DeletToInventory in HGInventoryAccessModule. This ↵ | Diva Canto | 2010-06-29 | 1 | -1/+2 |
| | | | | | | | | | | | | may be causing the infinite loop, not sure. | ||||
| * | | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-06-29 | 1 | -4/+28 |
| |/ | | | | | | | the script hasn't yet saved state, or can't save state because of a loop | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-29 | 11 | -46/+133 |
| |\ | |||||
| | * | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
| | * | Revert "don't report the null uuid as a missing asset on saving oars/iars" | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. 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 | ||||
| | * | This file wants to be committed. | Diva Canto | 2010-06-29 | 1 | -70/+70 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-29 | 1 | -18/+71 |
| | |\ | |||||
| | | * | Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return ↵ | dahlia | 2010-06-28 | 1 | -18/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | correct rotations for a 180 degree angle between vectors Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| | * | | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵ | Diva Canto | 2010-06-29 | 3 | -4/+11 |
| | | | | | | | | | | | | | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". | ||||
| | * | | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵ | Diva Canto | 2010-06-29 | 3 | -12/+7 |
| | |/ | | | | | | | | | | comments in InventoryAccessModule. | ||||
| | * | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | | | | | | | | | being updated. | ||||
| | * | Fixes mantis #4815 and #4812 | Diva Canto | 2010-06-28 | 1 | -1/+5 |
| | | | |||||
| * | | Fix a nullref on autoreturn | Melanie | 2010-06-29 | 1 | -5/+17 |
| |/ | |||||
| * | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 2 | -2/+2 |
| | | | | | | | | allow later conversion to new style | ||||
| * | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 4 | -6/+6 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 3 | -20/+6 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Fix a simian compiler warning | Melanie | 2010-06-27 | 1 | -1/+1 |
| | | |||||
| * | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
| * | Add command-script to the Robust console | Robert Adams | 2010-06-27 | 1 | -0/+41 |
| | | |||||
| * | Addresses mantis #4789. Not really a fix, because the event is harmless ↵ | Diva Canto | 2010-06-27 | 1 | -1/+7 |
| | | | | | | | | anyway. Just shouldn't happen normally. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-27 | 1 | -11/+12 |
| |\ | |||||
| | * | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take. | Melanie | 2010-06-27 | 1 | -8/+9 |
| | | | | | | | | | | | | Preserve "Anyone can move" flag in most cases. | ||||
| * | | Fixed Robust.32BitLaunch.exe | Diva Canto | 2010-06-27 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-29 | 4 | -5/+9 |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Comment the "Notecard saved" notification that pops up when a notecard | Melanie Thielker | 2010-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Make newly created prims be named "Object" and make newly created scripts | Melanie Thielker | 2010-06-29 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | have a default touch handler. Compatibility patch | ||||
| * | | | Force IM timestamps to current server time to prevent "Saved on" headers | Melanie Thielker | 2010-06-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | while the sender is online | ||||
* | | | | The other half of the asset fix. Implement an exponentially incrementing ↵ | Tom Grimshaw | 2010-06-29 | 2 | -11/+96 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Return a UUID.Zero if the asset fails to upload | Tom Grimshaw | 2010-06-28 | 1 | -1/+4 |
| | | | | |||||
* | | | | Provide the interface for StoreAsset to report success or failure | Tom Grimshaw | 2010-06-28 | 7 | -7/+16 |
|/ / / | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-27 | 14 | -62/+86 |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | allow later conversion to new style | ||||
| * | | | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | | | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 3 | -20/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-06-27 | 8 | -37/+66 |
| |\ \ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take. | Melanie | 2010-06-27 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | Preserve "Anyone can move" flag in most cases. | ||||
| | * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-27 | 7 | -27/+42 |
| | |\ \ \ | | | | |/ | | | |/| |