Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 2 | -3/+3 | |
* | | | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 2 | -3/+3 | |
* | | | | Correct some SQL syntax | Melanie | 2012-01-24 | 1 | -1/+1 | |
* | | | | Fix merge artefacts and build break | Melanie | 2012-01-24 | 1 | -1/+1 | |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add a forgotten parameter | Melanie | 2012-01-24 | 1 | -1/+1 | |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 5 | -208/+146 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Change Telehubs to store only the data that is really needed and not | Melanie | 2012-01-24 | 4 | -194/+123 | |
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-23 | 1 | -4/+11 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim into telehub | BlueWall | 2012-01-23 | 2 | -2/+5 | |
| | |\ \ \ | ||||||
| | * | | | | Add update to Telehub position and rotation before adding SpawnPoints | BlueWall | 2012-01-23 | 1 | -4/+11 | |
| * | | | | | IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the | Melanie | 2012-01-23 | 1 | -12/+3 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-23 | 1 | -2/+2 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'telehub' | BlueWall | 2012-01-23 | 1 | -53/+55 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | Cleanup | BlueWall | 2012-01-23 | 1 | -3/+6 | |
| | * | | | | Cleanup unused parts, add some error handling | BlueWall | 2012-01-23 | 1 | -53/+52 | |
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-23 | 3 | -48/+44 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-23 | 3 | -48/+44 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-22 | 1 | -0/+3 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Add note about setting up test databases | BlueWall | 2012-01-22 | 1 | -0/+3 | |
| | | |/ / / | ||||||
| | * | | | | Fix up some parameter naming | Melanie | 2012-01-22 | 1 | -2/+2 | |
| | |/ / / | ||||||
| | * | | | Finish connecting Telehub to database | BlueWall | 2012-01-22 | 2 | -47/+25 | |
| | * | | | Hooking up new telehub data to the database | BlueWall | 2012-01-22 | 1 | -0/+14 | |
* | | | | | Fix llLookAt the right way | Melanie | 2012-01-23 | 1 | -19/+24 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-01-22 | 7 | -73/+350 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Change the key name I missed in last commit | Melanie | 2012-01-22 | 1 | -1/+1 | |
| * | | | Move Telehub tables and data from EstateSettings to RegionSettings. | Melanie | 2012-01-22 | 8 | -267/+273 | |
| * | | | Telehub Support: | BlueWall | 2012-01-21 | 6 | -71/+341 | |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 22 | -46/+762 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 11 | -33/+149 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collid... | Justin Clark-Casey (justincc) | 2012-01-20 | 7 | -0/+0 | |
| | * | | Allow a viewer UDP image request retry to trigger another asset fetch if an e... | Justin Clark-Casey (justincc) | 2012-01-19 | 2 | -6/+32 | |
| | * | | Add image not in database test for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 4 | -13/+58 | |
| | * | | refactor: separate out common parts of LLImageManagerTests | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -48/+40 | |
| | * | | Add LLImageManager regression test for discard case | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+53 | |
| * | | | Telehub Support: | BlueWall | 2012-01-20 | 7 | -4/+251 | |
| |/ / | ||||||
| * | | Add "image queues clear <first-name> <last-name>" console command | Justin Clark-Casey (justincc) | 2012-01-19 | 2 | -15/+80 | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-19 | 4 | -1/+64 | |
| |\ \ | ||||||
| | * | | Add osGetGridHomeURI function | BlueWall | 2012-01-19 | 3 | -0/+28 | |
| | * | | Change URI to lowercase to match existing | BlueWall | 2012-01-19 | 1 | -1/+1 | |
| | * | | Add fetching of SRV_HomeURI to "/json_grid_info" | BlueWall | 2012-01-19 | 1 | -1/+36 | |
| * | | | Add basic request and send image regression tests for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 7 | -12/+109 | |
| |/ / | ||||||
| * | | RegionReady: | BlueWall | 2012-01-18 | 2 | -1/+7 | |
| * | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-17 | 3 | -1/+34 | |
| |\ \ | ||||||
| | * | | Add function osGetGridCustom | BlueWall | 2012-01-17 | 3 | -1/+34 | |
| * | | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-17 | 4 | -3/+92 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Update osGetGrid**** functions | BlueWall | 2012-01-17 | 2 | -3/+75 | |
| | * | | Merge branch 'master' of /home/opensim/lib/osgrid/opensim | BlueWall | 2012-01-17 | 2 | -0/+17 | |
| | |\ \ | ||||||
| | | * | | Add json handler for GridInfo | BlueWall | 2012-01-17 | 2 | -0/+17 |