aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Update BulletSim.dll with some interface changes and tuning (see opensim-libs...Robert Adams2012-01-257-8/+34
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-257-22/+100
|\
| * llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParce...Pixel Tomsen2012-01-255-1/+34
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-252-8/+51
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-3/+51
| | |\
| | | * Telehub map items displayedBlueWall2012-01-241-3/+51
| | * | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreate...Dan Lake2012-01-241-6/+0
| * | | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ /
* | | minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates...Justin Clark-Casey (justincc)2012-01-251-3/+3
* | | Serialize calls to ODE Collide() function across OdeScene instances to preven...Justin Clark-Casey (justincc)2012-01-252-1/+32
|/ /
* | Make errors reported by OpenSim when it halts because it can't find certain c...Justin Clark-Casey (justincc)2012-01-243-20/+12
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-241-0/+18
|\ \ | |/
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-0/+18
| |\
| | * Put Telehubs on the mapBlueWall2012-01-241-0/+18
* | | Comment out asset statistics section from periodic stats as these have not be...Justin Clark-Casey (justincc)2012-01-241-108/+109
|/ /
* | Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTIC...Justin Clark-Casey (justincc)2012-01-241-0/+1
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-241-13/+0
|\ \
| * | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObject...Dan Lake2012-01-241-13/+0
* | | Comment out inventory statistics section from periodic stats, since this only...Justin Clark-Casey (justincc)2012-01-241-14/+15
|/ /
* | minor: correct text and usage for "image queues show" reigon console command.Justin Clark-Casey (justincc)2012-01-241-2/+2
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-2413-9/+481
|\ \ | |/
| * Teleport routing, part 1Melanie2012-01-241-0/+53
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
| * Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
| * Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
| * Add a forgotten parameterMelanie2012-01-241-1/+1
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-244-194/+123
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-231-4/+11
| |\
| | * Merge branch 'master' of /home/opensim/var/repo/opensim into telehubBlueWall2012-01-232-2/+5
| | |\
| | * | Add update to Telehub position and rotation before adding SpawnPointsBlueWall2012-01-231-4/+11
| * | | IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since theMelanie2012-01-231-12/+3
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-231-2/+2
| |\ \
| | * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-221-0/+3
| | |\ \
| | * | | Fix up some parameter namingMelanie2012-01-221-2/+2
| * | | | Merge branch 'telehub'BlueWall2012-01-231-53/+55
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Cleanup BlueWall2012-01-231-3/+6
| | * | Cleanup unused parts, add some error handlingBlueWall2012-01-231-53/+52
| | |/
| * | Add note about setting up test databasesBlueWall2012-01-221-0/+3
| |/
| * Finish connecting Telehub to databaseBlueWall2012-01-222-47/+25
| * Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
| * Change the key name I missed in last commitMelanie2012-01-221-1/+1
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-228-267/+273
| * Telehub Support:BlueWall2012-01-216-71/+341
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-2011-33/+149
| |\
| * | Telehub Support:BlueWall2012-01-207-4/+251
* | | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ...Justin Clark-Casey (justincc)2012-01-242-12/+27
| |/ |/|
* | Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collid...Justin Clark-Casey (justincc)2012-01-207-0/+0
* | Allow a viewer UDP image request retry to trigger another asset fetch if an e...Justin Clark-Casey (justincc)2012-01-192-6/+32
* | Add image not in database test for LLImageManagerJustin Clark-Casey (justincc)2012-01-194-13/+58
* | refactor: separate out common parts of LLImageManagerTestsJustin Clark-Casey (justincc)2012-01-191-48/+40