aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-0314-71/+1462
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-031-21/+34
| |\
| | * Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.Diva Canto2010-10-021-21/+34
| * | Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
| * | Adapt to core changesMelanie2010-10-031-1/+1
| * | Addign the new / renamed files for previous commitMelanie2010-10-038-0/+2655
| * | Initial port of the Warp3D map tile rendererMelanie2010-10-038-1293/+5
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-0/+24
|\ \ | |/
| * So, the client can have an old idea of the object properties for the object w...Melanie2010-10-021-0/+24
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-024-25/+55
|\ \ | |/
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-023-5/+5
| * Revert "Forward-port 0.6 fix"Melanie2010-10-023-17/+5
| * Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-011-5/+33
| |\
| | * couple fixes to enable profiles in simian connectorMaster ScienceSim2010-09-301-5/+33
| * | adding -logconfig to Robust.exeBlueWall2010-10-011-6/+20
| |/
* | Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
* | Replace CalculateMass with a better, contributed versionMelanie2010-10-021-243/+228
* | Enforce region agent limit as set in estate toolsMelanie2010-09-302-0/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-3014-46/+72
|\ \ | |/
| * Prevent dropping someone else's attachmentsMelanie2010-09-301-0/+3
| * Forward-port 0.6 fixMelanie2010-09-303-5/+17
| * Fix an inventory fetch issueMelanie2010-09-301-0/+3
| * Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnect...John Hurliman2010-09-291-0/+6
| * Cleanup: Removed an unreferenced variable from ActivityDetector.csJohn Hurliman2010-09-291-11/+1
| * Part two of the previous commit, making IGridUserService.LoggedOut() more fle...John Hurliman2010-09-2910-16/+22
| * Made IGridUserService.SetLastPosition() more flexible to allow different poss...John Hurliman2010-09-299-21/+30
* | Fix an inventory fetch issueMelanie2010-09-301-0/+3
* | Fix a potential key collisionMelanie2010-09-301-1/+1
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
* | Try to prevent threading issues in SP.SetAppearance by locking itMelanie2010-09-271-40/+45
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-272-47/+51
|\ \ | |/
| * Restrict top colliders / top scripts to estate managersMelanie2010-09-271-0/+3
| * Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| * Fix build breakMelanie2010-09-271-37/+38
* | Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-1/+1
|\ \ | |/
| * Quash the region ID on intersim messages. That prevents people from determiningMelanie2010-09-271-1/+1
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-3/+11
| * Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
* | Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-264-9/+11
|\ \ | |/
| * When receiving intersim IM, don't let the spoof protection bombMelanie2010-09-261-1/+2
| * Consistency patch: use Path.Combine() instead of + and eliminate the needMelanie2010-09-263-8/+9
| * Typo fixesMelanie2010-09-262-7/+7
| * adding configurable j2kDecodeCache pathBlueWall2010-09-264-8/+18
| * Add configurable path to script engine assembliesBlueWall2010-09-264-15/+25
* | Typo fixesMelanie2010-09-262-7/+7
* | Merge MasterMelanie2010-09-268-20/+40
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+2
|\ \ | |/