aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (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-102-5/+32
| | |\
| | * | 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-102-13/+43
|\ \ \ | |/ /
| * | Implement nudging support for strafing motionMelanie2011-11-101-2/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-102-12/+21
| |\ \ | | |/
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-105-33/+52
| | |\
| | * | When updating SOG, a physics taint should not override a full update with a t...Dan Lake2011-11-101-10/+15
| * | | Alter commit 3758306 to allow region name to be substituted within a region c...Justin Clark-Casey (justincc)2011-11-101-3/+28
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-102-10/+15
|\ \ \ \
| * \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-102-10/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-102-10/+15
| | |\ \ \ | | | |/ /
| | | * | convert tabs from commit 3758306 to spacesJustin Clark-Casey (justincc)2011-11-101-3/+6
| | | * | launch pCampbot shutdown console comand asynchronouslyJustin Clark-Casey (justincc)2011-11-101-2/+5
| | | * | Remove unused index parameter from BotManager.startupBot(). Rename startupBo...Justin Clark-Casey (justincc)2011-11-101-5/+4
| | * | | Fix misaligned sit animation on scripted sit caused by the default sitMelanie2011-11-101-2/+6
| | |/ /
* | | | 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-106-34/+44
|\ \ \ | |/ /
| * | Allow custom setting for the console promptGuduleLapointe2011-11-101-2/+3
| * | minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| * | Use IsConnected status to determine whether all pCampBots have disconnected, ...Justin Clark-Casey (justincc)2011-11-092-16/+22
| * | In pCampBot, don't try and pull down Primitive faces or sculpts set to nullJustin Clark-Casey (justincc)2011-11-091-6/+9
| |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| * Correct test failure in sit position check of TestSitAndStandWithNoTarget()Justin Clark-Casey (justincc)2011-11-071-1/+3
* | Fix the ability to move the seated avatar via LSLMelanie2011-11-081-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-071-1/+1
|\ \ | |/
| * That such a trivial change can be so difficult to get right. Fix it this time.Melanie2011-11-071-1/+1
| * Fix build breakMelanie2011-11-071-1/+1
| * Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
* | Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-11-066-11/+15
|\ \ | |/
| * 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-0610-51/+52
* | 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-063-3/+18
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-062-2/+19
| |\
| | * HUD attachments: Removes some more messages sent to wrong clients.Snoopy Pfeffer2011-11-061-1/+10
| | * Damaged assets, especially appearance textures, could crash the region server...Snoopy Pfeffer2011-11-061-1/+9
| * | Allow HG and other scene presences not linked to a user account to function.Melanie2011-11-061-1/+4
| |/