| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 10 | -436/+29 |
|\ |
|
| * | Merge branch 'remove-scene-viewer' | Dan Lake | 2011-11-14 | 7 | -427/+22 |
| |\ |
|
| | * | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 7 | -427/+22 |
| * | | Improved method doc for AddFriend() - it actually does set up a two-way relat... | Justin Clark-Casey (justincc) | 2011-11-14 | 3 | -9/+7 |
* | | | Fix build break | Melanie | 2011-11-14 | 1 | -2/+1 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 12 | -23/+159 |
|\ \ \
| |/ / |
|
| * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -11/+2 |
| * | | Add test for adding a friend whilst online | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -7/+53 |
| * | | Add very simple FriendsModuleTests.TestNoFriends() | Justin Clark-Casey (justincc) | 2011-11-14 | 4 | -3/+91 |
| * | | If a friends identifier which is too short is given to HGFriendsModule.GetOnl... | Justin Clark-Casey (justincc) | 2011-11-14 | 2 | -1/+10 |
| * | | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to s... | Justin Clark-Casey (justincc) | 2011-11-14 | 2 | -1/+4 |
| |/ |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 |
| * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 |
* | | Fix taking or returning locked objects losing permissions for owner | Melanie | 2011-11-12 | 2 | -2/+10 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 6 | -278/+399 |
|\ \
| |/ |
|
| * | Make log messages on authentication failure more explicit | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -13/+26 |
| * | extract common ScenePresence setup code into Init() method for ScenePresenceS... | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -39/+31 |
| * | add SP.PhysicsActor checks to other sit/stand tests | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+4 |
| * | add sit and stand on ground test | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+23 |
| * | extract ground sit code into SP.HandleAgentSitOnGround() for consistency with... | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -12/+19 |
| * | Pick up the intended ConsolePrompt from [Startup] instead of console_prompt. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -1/+1 |
| * | As with prim sitting avatars, make an avatar phantom when it sits on the grou... | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -6/+5 |
| * | Restore sending of OutPacket() for object kills removed in commit c7dd7b1. | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -26/+20 |
| * | remove unncessary IClientAPI parameter from SP.SendSitResponse() | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -4/+3 |
| * | As per mailing list last week, remove facility that would automatically move ... | Justin Clark-Casey (justincc) | 2011-11-11 | 2 | -228/+198 |
| * | Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing l... | Justin Clark-Casey (justincc) | 2011-11-11 | 2 | -17/+42 |
| * | update minimum mono version | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -3/+1 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-11 | 6 | -274/+285 |
| |\ |
|
| * | | Add new ScenePresenceSitTests with a single sit/stand test | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -0/+103 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -0/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | one more jenkins test! | nebadon | 2011-11-10 | 1 | -0/+1 |
| * | | one more test of jenkins! | nebadon | 2011-11-10 | 1 | -1/+0 |
| * | | one more round with leeeeeeeeeeroy jaaaaaaenkins! | nebadon | 2011-11-10 | 1 | -0/+1 |
| * | | take two on jenkins testing! | nebadon | 2011-11-10 | 1 | -1/+1 |
| * | | test push to see if sir jenkins responds! | nebadon | 2011-11-10 | 1 | -0/+1 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 0 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | Fix compile error from an earlier commit | Dan Lake | 2011-11-10 | 1 | -2/+0 |
* | | | 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 |
| |\ \ |
|
| * | | | In SOP, replaced many references to private members with the public properties | Dan Lake | 2011-11-10 | 1 | -243/+233 |
* | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 0 | -0/+0 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-11 | 1 | -4/+19 |
* | | | | 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 | 4 | -11/+47 |
| | |\ \
| | | |/ |
|
| | * | | 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 |