aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-2511-138/+370
|\
| * Rename "image queues clear" console command to "clear image queues"Justin Clark-Casey (justincc)2012-07-241-12/+6
| * Add information about each column to "show queues" region console command help.Justin Clark-Casey (justincc)2012-07-241-2/+9
| * Extend region console "show queues" command to show already collected time si...Justin Clark-Casey (justincc)2012-07-242-19/+26
| * Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| * extend regression TestRezScriptedAttachmentFromInventory() to check actual st...Justin Clark-Casey (justincc)2012-07-241-3/+19
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-247-96/+265
| |\
| | * BulletSim: update BulletSim.dlls and so'sRobert Adams2012-07-234-0/+0
| | * BulletSim: change how prim mass is saved so it is always calculated but zero ...Robert Adams2012-07-231-20/+23
| | * BulletSim: small optimizations for link and unlink codeRobert Adams2012-07-231-12/+8
| | * BulletSim: add Dispose() code to free up resources and close log files.Robert Adams2012-07-231-0/+21
| | * BulletSim: add all the new functions to BulletSimAPI.Robert Adams2012-07-232-6/+139
| | * BulletSim: improve linking to add each link individually rather than rebuildi...Robert Adams2012-07-231-60/+76
| * | extend regression TestDetachScriptedAttachementToInventory() to check correct...Justin Clark-Casey (justincc)2012-07-242-5/+45
| |/
* | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-252-4/+2
* | Merge branch 'avination' into careminsterMelanie2012-07-235-42/+81
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
* | | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+82
* | | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \ \ | |/ /
| * | Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
|\ \ \ | | |/ | |/|
| * | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
* | | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \ \ | | |/ | |/|
| * | Committing Avination's memleak fix-a-thon, installment #2Melanie2012-07-231-1/+10
| * | Commiting Avination's memleak fix-a-thon, installment #1Melanie2012-07-231-4/+8
* | | Fix merge issues in prebuildMelanie2012-07-231-33/+33
* | | Merge branch 'master' into careminsterMelanie2012-07-2316-253/+762
|\ \ \ | |/ /
| * | Update BulletSim DLLs and SOsRobert Adams2012-07-202-0/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-207-60/+61
| |\ \
| | * | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled b...Robert Adams2012-07-201-58/+58
| | * | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempti...Robert Adams2012-07-206-2/+3
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-207-243/+694
| |\ \ \ | | |/ /
| | * | BulletSim: more detail logging for vehicle and general physics debugging.Robert Adams2012-07-204-75/+244
| | * | Remove an added but unnecessary dependency in prebuild.xmlRobert Adams2012-07-201-1/+0
| | * | BulletSim: fix compile errors from last commit. Clean up passing of physics s...Robert Adams2012-07-202-15/+14
| | * | BulletSim: Add very detailed logging to BSDynamics for vehicle debuggingRobert Adams2012-07-203-45/+146
| | * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a simpl...Robert Adams2012-07-203-1/+163
| | * | BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon.Robert Adams2012-07-203-101/+97
| | * | BulletSim: Add detailed and voluminous debug logging that is enabledRobert Adams2012-07-202-40/+65
| * | | Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all othe...Justin Clark-Casey (justincc)2012-07-201-4/+8
| |/ /
| * | As per opensim-dev mailing list discussion, extend llGetDetectedType() to ret...Justin Clark-Casey (justincc)2012-07-201-5/+28
| * | As per opensim-dev mailing list conversation, introduce OS_NPC constant for u...Justin Clark-Casey (justincc)2012-07-202-2/+4
* | | Merge branch 'master' into careminsterMelanie2012-07-204-3/+39
|\ \ \ | |/ /
| * | Enables support for UUIDs to be returned in lists fromMic Bowman2012-07-201-3/+13
| * | Implements a very useful OSSL function to test a string to seeMic Bowman2012-07-203-0/+26
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | |/ /
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
* | | Merge branch 'avination' into careminsterMelanie2012-07-208-155/+202
|\ \ \ | | |/ | |/|