aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | 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
| |/
| * 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-052-30/+5
* | 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
generated by cgit v1.1 at 2024-09-28 07:34:30 +0000