aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* ANother stab at LSL compatibilityMelanie Thielker2010-07-013-3/+3
* Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-07-011-0/+8
|\
| * Fix build breakTom Grimshaw2010-07-011-1/+1
| * Report asset upload success if it has previously failedTom Grimshaw2010-07-011-0/+4
| * Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-07-0116-42/+170
| |\
| * | Catch newid == null which is what happens if the asset service is offline (se...Tom Grimshaw2010-07-011-0/+4
* | | Remove trailing slash from HTTP URLs to be compatible with SLMelanie Thielker2010-07-011-1/+1
| |/ |/|
* | Avoid a spurious error message when taking a friend's no copy itemMelanie Thielker2010-07-012-11/+38
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-3015-31/+132
|\ \ | |/ |/|
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-302-31/+12
| |\
| | * Removed opportunity for exception in BaseHttpServer. (mantis #4825)Diva Canto2010-06-301-0/+4
| | * Revert "stop exceptions in setting and getting state from propogating since t...Justin Clark-Casey (justincc)2010-06-291-31/+8
| * | Fix scripts in rezzed objects not starting (Mantis #4775)Melanie2010-06-301-0/+5
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-291-1/+2
| |\
| | * Remove the override from DeletToInventory in HGInventoryAccessModule. This ma...Diva Canto2010-06-291-1/+2
| * | Fix the XML serializationt to provide an empty script state element ifMelanie2010-06-291-4/+28
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-2911-46/+133
| |\
| | * stop exceptions in setting and getting state from propogating since they aren...Justin Clark-Casey (justincc)2010-06-291-8/+31
| | * Revert "don't report the null uuid as a missing asset on saving oars/iars"Justin Clark-Casey (justincc)2010-06-291-5/+3
| | * This file wants to be committed.Diva Canto2010-06-291-70/+70
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-291-18/+71
| | |\
| | | * Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return ...dahlia2010-06-281-18/+71
| | * | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventor...Diva Canto2010-06-293-4/+11
| | * | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ...Diva Canto2010-06-293-12/+7
| | |/
| | * One more bug fix in FriendsModule: GrantRights. One of the caches was not bei...Diva Canto2010-06-281-0/+7
| | * Fixes mantis #4815 and #4812Diva Canto2010-06-281-1/+5
| * | Fix a nullref on autoreturnMelanie2010-06-291-5/+17
| |/
| * Change the way IRegionModule us referenced by IEmailModule toMelanie Thielker2010-06-282-2/+2
| * Remove AgentID and GroupOD from the signature of SOG.Copy(). They were neverMelanie Thielker2010-06-284-6/+6
| * Fix Copy on Ray, Drag Copy and other little things. Removed the wrong andMelanie Thielker2010-06-283-20/+6
| * Fix a simian compiler warningMelanie2010-06-271-1/+1
| * Make drag copy and copy-on-ray handle friends list perms properlyMelanie Thielker2010-06-271-0/+22
| * Add command-script to the Robust consoleRobert Adams2010-06-271-0/+41
| * Addresses mantis #4789. Not really a fix, because the event is harmless anywa...Diva Canto2010-06-271-1/+7
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-271-11/+12
| |\
| | * Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.Melanie2010-06-271-8/+9
| * | Fixed Robust.32BitLaunch.exeDiva Canto2010-06-271-2/+2
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-06-294-5/+9
|\ \ \
| * | | Comment the "Notecard saved" notification that pops up when a notecardMelanie Thielker2010-06-291-1/+1
| * | | Make newly created prims be named "Object" and make newly created scriptsMelanie Thielker2010-06-293-4/+4
| * | | Force IM timestamps to current server time to prevent "Saved on" headersMelanie Thielker2010-06-281-0/+4
* | | | The other half of the asset fix. Implement an exponentially incrementing retr...Tom Grimshaw2010-06-292-11/+96
* | | | Return a UUID.Zero if the asset fails to uploadTom Grimshaw2010-06-281-1/+4
* | | | Provide the interface for StoreAsset to report success or failureTom Grimshaw2010-06-287-7/+16
|/ / /
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-06-2714-62/+86
|\ \ \
| * | | Change the way IRegionModule us referenced by IEmailModule toMelanie Thielker2010-06-282-2/+2
| * | | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were neverMelanie Thielker2010-06-284-6/+6
| * | | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong andMelanie Thielker2010-06-283-20/+6
| * | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-06-278-37/+66
| |\ \ \
| | * | | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.Melanie2010-06-271-8/+9