aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-245-58/+30
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-245-58/+30
| |\ \ | | |/
| | * Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-224-29/+22
| | * Chain SOP constructors together rather than having copy/paste codeJustin Clark-Casey (justincc)2011-11-211-14/+5
| | * refactor: Make SOP.Description an automatic propertyJustin Clark-Casey (justincc)2011-11-211-6/+3
| | * Remove unused PhysicsActor.SOPDescriptionJustin Clark-Casey (justincc)2011-11-211-11/+2
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-193-20/+22
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-193-20/+22
| |\ \ | | |/
| | * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-191-2/+6
| | * Don't register a region twice on both official registration and maptile regen...Justin Clark-Casey (justincc)2011-11-191-7/+5
| | * If the entire simulator is shutting down then don't bother to unload the scri...Justin Clark-Casey (justincc)2011-11-171-10/+16
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-178-136/+56
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-178-136/+56
| |\ \ | | |/
| | * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow...Justin Clark-Casey (justincc)2011-11-163-3/+11
| | * Call public ForEach instead of using m_entities directly. No semantic changes...Dan Lake2011-11-161-2/+2
| | * In AddNewClient, iterator over copy of entities rather than copying under rea...Dan Lake2011-11-151-2/+3
| | * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-151-1/+3
| | * Add comments about trying to avoid synchronous work off the EventManager.OnMa...Justin Clark-Casey (justincc)2011-11-152-4/+12
| | * Removed unused and mostly commented out SceneCommunicationService methodsJustin Clark-Casey (justincc)2011-11-152-116/+3
| | * Remove unused RegionCommsListener/IRegionCommsListener.Justin Clark-Casey (justincc)2011-11-151-3/+0
| | * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is n...Justin Clark-Casey (justincc)2011-11-153-10/+6
| | * For clients that are entering a simulator from initial login, stop executing ...Justin Clark-Casey (justincc)2011-11-151-4/+6
| | * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-141-0/+11
* | | Force a sim exit when hearbeat isn't restarting successfullyMelanie2011-11-171-0/+4
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-147-414/+24
|\ \ | |/
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-146-409/+22
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-116-409/+22
| * | Improved method doc for AddFriend() - it actually does set up a two-way relat...Justin Clark-Casey (justincc)2011-11-141-5/+2
* | | Merge branch 'master' into bigmergeMelanie2011-11-142-0/+16
|\ \ \ | |/ /
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-0/+14
| * | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to s...Justin Clark-Casey (justincc)2011-11-141-0/+2
| |/
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-121-1/+9
* | Merge branch 'master' into bigmergeMelanie2011-11-112-248/+370
|\ \ | |/
| * extract common ScenePresence setup code into Init() method for ScenePresenceS...Justin Clark-Casey (justincc)2011-11-111-39/+31
| * add SP.PhysicsActor checks to other sit/stand testsJustin Clark-Casey (justincc)2011-11-111-0/+4
| * add sit and stand on ground testJustin Clark-Casey (justincc)2011-11-111-0/+23
| * extract ground sit code into SP.HandleAgentSitOnGround() for consistency with...Justin Clark-Casey (justincc)2011-11-111-12/+19
| * As with prim sitting avatars, make an avatar phantom when it sits on the grou...Justin Clark-Casey (justincc)2011-11-111-6/+5
| * remove unncessary IClientAPI parameter from SP.SendSitResponse()Justin Clark-Casey (justincc)2011-11-111-4/+3
| * As per mailing list last week, remove facility that would automatically move ...Justin Clark-Casey (justincc)2011-11-112-228/+198
| * Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing l...Justin Clark-Casey (justincc)2011-11-112-17/+42
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-115-274/+283
| |\
| | * Fix compile error from an earlier commitDan Lake2011-11-101-2/+0
| * | Add new ScenePresenceSitTests with a single sit/stand testJustin Clark-Casey (justincc)2011-11-111-0/+103
* | | Merge branch 'master' into bigmergeMelanie2011-11-111-247/+236
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-103-10/+35
| |\ \
| | * | Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-111-4/+19
| * | | In SOP, replaced many references to private members with the public propertiesDan Lake2011-11-101-243/+233
* | | | Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-101-4/+17
* | | | Merge branch 'master' into bigmergeMelanie2011-11-102-19/+15
|\ \ \ \ | | |/ / | |/| |