aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-1623-67/+146
|\
| * minor: remove long commented out scene cache clearing code in EntityTransferM...Justin Clark-Casey (justincc)2013-05-161-9/+0
| * minor: Remove completely unused IClientAPI.RequestClientInfo() call from Enti...Justin Clark-Casey (justincc)2013-05-161-3/+0
| * Where this is not already happening, trigger asychoronous calls to CloseChild...Justin Clark-Casey (justincc)2013-05-163-2/+3
| * On closing child agents, send separate asynchronous requests to each neighbou...Justin Clark-Casey (justincc)2013-05-163-9/+5
| * On logout, send close child agent requests to neighbours asynchronously, so u...Justin Clark-Casey (justincc)2013-05-161-6/+3
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ...dahlia2013-05-151-0/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-151-0/+3
| |\
| | * Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| * | Fix issue where osMakeNotecard() would fail if given a list containing vector...Justin Clark-Casey (justincc)2013-05-151-30/+30
| |/
| * Comment out log message about looking for asset data in remove asset service ...Justin Clark-Casey (justincc)2013-05-141-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-142-1/+8
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-141-2/+5
| | |\
| | * | Second take at HGTP-mesh bug: delay sending the initial data only for agents ...Diva Canto2013-05-142-1/+8
| * | | Comment out some debugging item permission messages since these are highly no...Justin Clark-Casey (justincc)2013-05-141-3/+3
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-142-3/+3
| |\ \ | | |/
| | * Revert "HGTP-mesh bug: the mesh download requests were going to the departing...Diva Canto2013-05-142-3/+3
| * | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you...Vegaslon2013-05-141-2/+5
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-144-7/+44
| |\
| | * BulletSim: add a lock to try and catch a native shape creation/destructionRobert Adams2013-05-131-2/+7
| | * BulletSim: add adjustment for avatar capsule height scaling. MakesRobert Adams2013-05-132-4/+32
| | * BulletSim: use heightmap terrain when using BulletXNA.Robert Adams2013-05-132-1/+5
| * | HGTP-mesh bug: the mesh download requests were going to the departing sims fo...Diva Canto2013-05-142-3/+3
| |/
| * Fixed mantis #6609 -- LoadPlugin error messages on Robust.Diva Canto2013-05-135-7/+26
| * Groups: Improve error handling on remote connector.Diva Canto2013-05-131-4/+9
| * Fixes mantis #6636 -- GroupsDiva Canto2013-05-132-1/+7
* | Merge branch 'master' into careminsterMelanie2013-05-124-38/+50
|\ \ | |/
| * Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ...Diva Canto2013-05-113-54/+19
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-116-5/+66
| |\
| * | Handle SetHome properlyDiva Canto2013-05-111-0/+59
| * | Delete debug messageDiva Canto2013-05-101-1/+0
* | | Merge branch 'master' into careminsterMelanie2013-05-1125-139/+194
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-1122-134/+179
| |\ \
| | * | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | |/
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | * minor: Remove unnecessary code that was generating warning in TestXInventoryD...Justin Clark-Casey (justincc)2013-05-091-2/+2
| | * minor: Remove mono compiler warning in RemoteAdminPluginJustin Clark-Casey (justincc)2013-05-091-1/+1
| | * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | * Only send one kill object to the deleter when they derez an object rather tha...Justin Clark-Casey (justincc)2013-05-092-17/+12
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-098-14/+11
| | * Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-098-88/+102
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-092-2/+25
| | |\
| | | * Application support:BlueWall2013-05-092-2/+25
| | * | minor: Simplify test setup in SceneObjectDeRezTests since permissions module ...Justin Clark-Casey (justincc)2013-05-091-10/+4
| | |/
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-115-3/+60
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-089-11/+205
|\ \ | |/
| * Guard the scene list when estates are updatedMelanie2013-05-082-9/+14
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-087-15/+171
* | Merge branch 'master' into careminsterMelanie2013-05-0814-58/+1216
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-071-6/+10
| |\