aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-139-32/+444
|\
| * Fix mono compiler warning.Justin Clark-Casey (justincc)2012-05-121-1/+1
| * Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-126-100/+5
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-106-5/+100
| * Print out more information on connecting botsJustin Clark-Casey (justincc)2012-05-112-9/+19
| * Increase minimum period between bot actions to 3 seconds, so that teleport do...Justin Clark-Casey (justincc)2012-05-111-2/+2
| * Stagger multiple bot logins by 5 seconds to make this part of the test more '...Justin Clark-Casey (justincc)2012-05-111-0/+13
| * Do bot startup on another thread so console is responsive during this processJustin Clark-Casey (justincc)2012-05-112-1/+5
| * Do each bot shutdown on its own threads to prevent one slow shutdown holding ...Justin Clark-Casey (justincc)2012-05-111-8/+13
| * Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, C...Justin Clark-Casey (justincc)2012-05-112-5/+22
| * If a bot is not connected, show region name "(none)" instead of throwing an e...Justin Clark-Casey (justincc)2012-05-111-1/+3
| * Add ConsoleTable framework class for future uniform formatting of console out...Justin Clark-Casey (justincc)2012-05-102-8/+165
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-103-7/+34
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-1028-27/+136
| | |\
| | * | Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-103-7/+34
| * | | Add "attachments" show console command that will show the server's record of ...Justin Clark-Casey (justincc)2012-05-101-0/+177
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-05-103-9/+13
|\ \ \ | |/ /
| * | Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-103-9/+13
* | | Merge branch 'master' into careminsterMelanie2012-05-1024-11/+114
|\ \ \ | |/ /
| * | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the...Justin Clark-Casey (justincc)2012-05-0915-0/+0
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-094-8/+15
| * | Escape and unescape xml element names if necessary in ServerUtils.BuildXmlDat...Justin Clark-Casey (justincc)2012-05-091-3/+3
| * | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-094-0/+96
* | | Merge branch 'master' into careminsterMelanie2012-05-0916-239/+346
|\ \ \ | |/ /
| * | Remove physics actor related race conditions in SetVehicleFlags() and SetPhys...Justin Clark-Casey (justincc)2012-05-091-7/+9
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\
| | * Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| * | Trigger event when scene presences are updatedDan Lake2012-05-082-0/+34
| |/
| * Add automated TestllBreakLink()Justin Clark-Casey (justincc)2012-05-081-0/+27
| * Add automated TestllCreateLink()Justin Clark-Casey (justincc)2012-05-081-0/+112
| * refactor: Eliminate local id parameter from api initialize.Justin Clark-Casey (justincc)2012-05-0810-46/+36
| * Instead of constantly looking up unchanging self item in script code, pass in...Justin Clark-Casey (justincc)2012-05-0810-190/+145
| * Perform SceneGraph.DuplicateObject() under existing m_updateLock already used...Justin Clark-Casey (justincc)2012-05-081-75/+89
* | Merge branch 'master' into careminsterMelanie2012-05-083-47/+38
|\ \ | |/
| * Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| * Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
| * For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and osGetGridCustom...Justin Clark-Casey (justincc)2012-05-071-8/+10
| * refactor: Instead of performing a ScenePresence lookup twice over LocateClien...Justin Clark-Casey (justincc)2012-05-071-18/+2
| * Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ...Justin Clark-Casey (justincc)2012-05-071-2/+7
* | Merge branch 'avination' into careminsterMelanie2012-05-083-15/+46
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-05-071-11/+17
| |\ \
| | * | minor change to linear motor decayUbitUmarov2012-05-071-11/+17
| * | | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-072-4/+29
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-05-079-12/+22
|\ \ \ | | |/ | |/|
| * | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O...dahlia2012-05-071-4/+8
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-075-5/+5
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for m...dahlia2012-05-064-4/+9
| * | Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
| * | just another test :)nebadon2012-05-051-1/+1