| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -247/+236 |
|\ |
|
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 3 | -10/+35 |
| |\ |
|
| | * | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-11 | 1 | -4/+19 |
| * | | In SOP, replaced many references to private members with the public properties | Dan Lake | 2011-11-10 | 1 | -243/+233 |
* | | | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-10 | 1 | -4/+17 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 2 | -19/+15 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-10 | 2 | -19/+15 |
| |\ \
| | |/ |
|
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 2 | -5/+32 |
| | |\ |
|
| | * | | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant propert... | Dan Lake | 2011-11-10 | 2 | -19/+15 |
| * | | | Fix turn left and turn right properly. Works for both built-ins and LSL AOs | Melanie | 2011-11-10 | 2 | -6/+16 |
| | |/
| |/| |
|
* | | | Fix turn left and turn right properly. Works for both built-ins and LSL AOs | Melanie | 2011-11-10 | 2 | -6/+16 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 2 | -13/+43 |
|\ \ \
| |/ / |
|
| * | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-10 | 2 | -12/+21 |
| |\ \
| | |/ |
|
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 3 | -4/+12 |
| | |\ |
|
| | * | | When updating SOG, a physics taint should not override a full update with a t... | Dan Lake | 2011-11-10 | 1 | -10/+15 |
| * | | | Alter commit 3758306 to allow region name to be substituted within a region c... | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+28 |
* | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -3/+6 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-10 | 1 | -3/+6 |
| | |\ \ \
| | | |/ / |
|
| | | * | | convert tabs from commit 3758306 to spaces | Justin Clark-Casey (justincc) | 2011-11-10 | 1 | -3/+6 |
| | * | | | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 |
| | |/ / |
|
* | | | | Implement nudging support for strafing motion | Melanie | 2011-11-10 | 1 | -2/+4 |
|/ / / |
|
* | | | Fix misaligned sit animation on scripted sit caused by the default sit | Melanie | 2011-11-10 | 1 | -2/+6 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 3 | -4/+7 |
|\ \ \
| |/ / |
|
| * | | Allow custom setting for the console prompt | GuduleLapointe | 2011-11-10 | 1 | -2/+3 |
| * | | minor: Correct misleading method doc on SOG.UpdateRootRotation() | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -1/+1 |
| |/ |
|
| * | Correct test failure in sit position check of TestSitAndStandWithNoTarget() | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -1/+3 |
* | | Fix the ability to move the seated avatar via LSL | Melanie | 2011-11-08 | 1 | -0/+3 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-07 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | That such a trivial change can be so difficult to get right. Fix it this time. | Melanie | 2011-11-07 | 1 | -1/+1 |
| * | Fix build break | Melanie | 2011-11-07 | 1 | -1/+1 |
| * | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 |
* | | Fix up failing test to compensate for changed sit target offset | Melanie | 2011-11-06 | 1 | -2/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 6 | -11/+15 |
|\ \
| |/ |
|
| * | Make the AsyncSceneObjectDeleter send a list of kills. This will make large | Melanie | 2011-11-06 | 1 | -1/+7 |
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 8 | -49/+50 |
* | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... | Melanie | 2011-11-06 | 2 | -4/+9 |
|\ \ |
|
| * | | Small preformance tweak | Melanie | 2011-11-06 | 1 | -1/+1 |
| * | | Remove backup optimization that was causing prim contents to poof | Melanie | 2011-11-05 | 1 | -3/+8 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 2 | -2/+9 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-06 | 1 | -1/+10 |
| |\ |
|
| | * | HUD attachments: Removes some more messages sent to wrong clients. | Snoopy Pfeffer | 2011-11-06 | 1 | -1/+10 |
| * | | Allow HG and other scene presences not linked to a user account to function. | Melanie | 2011-11-06 | 1 | -1/+4 |
| |/ |
|
| * | Fix build break | Melanie | 2011-11-05 | 1 | -1/+1 |
* | | Break out the parts of ScenePresence that differ from core | Melanie | 2011-11-05 | 1 | -141/+146 |
* | | Fix up with core changes | Melanie | 2011-11-05 | 2 | -57/+31 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -6/+3 |
|\ \
| |/ |
|
| * | Remove spammy autopilot debug | Melanie | 2011-11-05 | 1 | -3/+3 |
| * | Remove some left over debug and reverse experimental reordering of ifs | Melanie | 2011-11-05 | 1 | -4/+2 |