aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Add LLImageManager regression test for discard caseJustin Clark-Casey (justincc)2012-01-191-0/+53
|/
* Add "image queues clear <first-name> <last-name>" console commandJustin Clark-Casey (justincc)2012-01-192-15/+80
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-194-1/+64
|\
| * Add osGetGridHomeURI functionBlueWall2012-01-193-0/+28
| * Change URI to lowercase to match existingBlueWall2012-01-191-1/+1
| * Add fetching of SRV_HomeURI to "/json_grid_info"BlueWall2012-01-191-1/+36
* | Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-197-12/+109
|/
* RegionReady:BlueWall2012-01-182-1/+7
* Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-173-1/+34
|\
| * Add function osGetGridCustomBlueWall2012-01-173-1/+34
* | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-174-3/+92
|\ \ | |/
| * Update osGetGrid**** functionsBlueWall2012-01-172-3/+75
| * Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-01-172-0/+17
| |\
| | * Add json handler for GridInfoBlueWall2012-01-172-0/+17
* | | Change linux, windows and mac ODE libraries to use the GIMPACT collider rathe...Justin Clark-Casey (justincc)2012-01-177-0/+0
|/ /
* | Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-167-2/+128
* | Comment out noisy log lines I accidentally included in the nant build target ...Justin Clark-Casey (justincc)2012-01-163-8/+8
* | Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-165-193/+20
|/
* protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
* commented out redundant land owner checks for osTeleportAgent there isnebadon2012-01-141-14/+24