aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into bigmergeMelanie2011-11-052-6/+3
|\ \ | |/
| * Remove spammy autopilot debugMelanie2011-11-051-3/+3
| * Remove some left over debug and reverse experimental reordering of ifsMelanie2011-11-051-4/+2
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-051-3/+0
| * Porting the ScenePresenceAnimator from Avination. Jump and fall anims now workMelanie2011-11-052-87/+136
| * Change puvlic m_ variable to a getter propertyMelanie2011-11-051-1/+5
| * ScenePresence part of the Avination animator fixes.Melanie2011-11-051-3/+58
| * Chnaging the sit target adjustment to a more precise approximation of SL. Som...Melanie2011-11-051-24/+35
* | Whitespace fix from coreMelanie2011-11-051-0/+1
* | Harmonize with core and remove extraneous comments with no information in themMelanie2011-11-051-105/+39
* | Change m_falling public to a getter property.Melanie2011-11-052-2/+6
* | Adapt to the core SP reworkMelanie2011-11-052-2/+6
* | Some more changes to catch up with coreMelanie2011-11-051-71/+49
* | Remove unused and broken OffsetRotation from ScenePresenceMelanie2011-11-051-29/+4
* | Some trivial changes to get closer to coreMelanie2011-11-051-12/+5
* | Change comment formatting to match core for a cleaner diffMelanie2011-11-051-23/+23