aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-102-19/+15
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-101-2/+4
| | |\ \ | | | |/
| | * | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant propert...Dan Lake2011-11-102-19/+15
| * | | Fix turn left and turn right properly. Works for both built-ins and LSL AOsMelanie2011-11-102-6/+16
| | |/ | |/|
* | | Fix turn left and turn right properly. Works for both built-ins and LSL AOsMelanie2011-11-102-6/+16
* | | Merge branch 'master' into bigmergeMelanie2011-11-101-10/+15
|\ \ \ | |/ /
| * | Implement nudging support for strafing motionMelanie2011-11-101-2/+4
| |/
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-102-3/+7
| |\
| | * Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| * | When updating SOG, a physics taint should not override a full update with a t...Dan Lake2011-11-101-10/+15
* | | Implement nudging support for strafing motionMelanie2011-11-101-2/+4
* | | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
* | | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+1
|\ \ \ | | |/ | |/|
| * | minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| |/
* | Fix the ability to move the seated avatar via LSLMelanie2011-11-081-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-063-9/+4
|\ \ | |/
| * Make the AsyncSceneObjectDeleter send a list of kills. This will make largeMelanie2011-11-061-1/+7
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-063-24/+14
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int...Melanie2011-11-062-4/+9
|\ \
| * | Small preformance tweakMelanie2011-11-061-1/+1
| * | Remove backup optimization that was causing prim contents to poofMelanie2011-11-051-3/+8
* | | Merge branch 'master' into bigmergeMelanie2011-11-062-2/+9
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-061-1/+10
| |\
| | * HUD attachments: Removes some more messages sent to wrong clients.Snoopy Pfeffer2011-11-061-1/+10
| * | Allow HG and other scene presences not linked to a user account to function.Melanie2011-11-061-1/+4
| |/
| * Fix build breakMelanie2011-11-051-1/+1
* | Break out the parts of ScenePresence that differ from coreMelanie2011-11-051-141/+146
* | Fix up with core changesMelanie2011-11-052-57/+31