aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* First change in Vivox for ages! -- added a lock to serialize calls to vivox s...Diva Canto2013-05-281-14/+25
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2011-81/+159
|\
| * fix error in hull point indexingdahlia2013-05-181-1/+1
| * remove duplicate hull scalingdahlia2013-05-181-3/+3
| * add prototype code to decode convex hulls from mesh assets. Please do not use...dahlia2013-05-181-21/+110
| * 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
| |\
| * | Comment out some debugging item permission messages since these are highly no...Justin Clark-Casey (justincc)2013-05-141-3/+3
* | | Add commentDiva Canto2013-05-201-0/+2
| |/ |/|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-141-2/+5
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-142-3/+3
| |\
| * | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you...Vegaslon2013-05-141-2/+5
* | | Second take at HGTP-mesh bug: delay sending the initial data only for agents ...Diva Canto2013-05-142-1/+8
| |/ |/|
* | Revert "HGTP-mesh bug: the mesh download requests were going to the departing...Diva Canto2013-05-142-3/+3
|/
* 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
* 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
|\
| * 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
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-115-3/+60
* | | Handle SetHome properlyDiva Canto2013-05-111-0/+59
* | | Delete debug messageDiva Canto2013-05-101-1/+0
| |/ |/|
* | 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
|/
* 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