aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-1412-23/+159
|\
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-144-11/+2
| * Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-144-7/+53
| * Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-144-3/+91
| * If a friends identifier which is too short is given to HGFriendsModule.GetOnl...Justin Clark-Casey (justincc)2011-11-142-1/+10
| * Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to s...Justin Clark-Casey (justincc)2011-11-142-1/+4
* | Merge branch 'master' into bigmergeMelanie2011-11-121-2/+3
|\ \ | |/
| * doh - correct build breakJustin Clark-Casey (justincc)2011-11-121-6/+7
| * Add threads to the watchdog thread list before we start them.Justin Clark-Casey (justincc)2011-11-121-5/+5
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-122-2/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-116-278/+399
|\ \ | |/
| * Make log messages on authentication failure more explicitJustin Clark-Casey (justincc)2011-11-111-13/+26
| * extract common ScenePresence setup code into Init() method for ScenePresenceS...Justin Clark-Casey (justincc)2011-11-111-39/+31
| * add SP.PhysicsActor checks to other sit/stand testsJustin Clark-Casey (justincc)2011-11-111-0/+4
| * add sit and stand on ground testJustin Clark-Casey (justincc)2011-11-111-0/+23
| * extract ground sit code into SP.HandleAgentSitOnGround() for consistency with...Justin Clark-Casey (justincc)2011-11-111-12/+19
| * Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.Justin Clark-Casey (justincc)2011-11-111-1/+1
| * As with prim sitting avatars, make an avatar phantom when it sits on the grou...Justin Clark-Casey (justincc)2011-11-111-6/+5
| * Restore sending of OutPacket() for object kills removed in commit c7dd7b1.Justin Clark-Casey (justincc)2011-11-111-26/+20
| * remove unncessary IClientAPI parameter from SP.SendSitResponse()Justin Clark-Casey (justincc)2011-11-111-4/+3
| * As per mailing list last week, remove facility that would automatically move ...Justin Clark-Casey (justincc)2011-11-112-228/+198
| * Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing l...Justin Clark-Casey (justincc)2011-11-112-17/+42
| * update minimum mono versionJustin Clark-Casey (justincc)2011-11-111-3/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-116-274/+285
| |\
| * | Add new ScenePresenceSitTests with a single sit/stand testJustin Clark-Casey (justincc)2011-11-111-0/+103
* | | Merge branch 'master' into bigmergeMelanie2011-11-111-0/+2
|\ \ \ | | |/ | |/|
| * | one more jenkins test!nebadon2011-11-101-0/+1
| * | one more test of jenkins!nebadon2011-11-101-1/+0
| * | one more round with leeeeeeeeeeroy jaaaaaaenkins!nebadon2011-11-101-0/+1
| * | take two on jenkins testing!nebadon2011-11-101-1/+1
| * | test push to see if sir jenkins responds!nebadon2011-11-101-0/+1
* | | Merge branch 'master' into bigmergeMelanie2011-11-110-0/+0
|\ \ \ | |/ /
| * | Fix compile error from an earlier commitDan Lake2011-11-101-2/+0
* | | Merge branch 'master' into bigmergeMelanie2011-11-111-247/+236
|\ \ \ | |/ /
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-103-10/+35
| |\ \
| * | | In SOP, replaced many references to private members with the public propertiesDan Lake2011-11-101-243/+233
* | | | Merge branch 'master' into bigmergeMelanie2011-11-110-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-111-4/+19
* | | | 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-104-11/+47
| | |\ \ | | | |/
| | * | 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-104-19/+58
|\ \ \ | |/ /
| * | 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-107-33/+58
| | |\
| | * | When updating SOG, a physics taint should not override a full update with a t...Dan Lake2011-11-101-10/+15