aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge artefacts and build breakMelanie2012-01-241-1/+1
|
* Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\
| * Add a forgotten parameterMelanie2012-01-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-245-208/+146
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-244-194/+123
| | | | | | | | additional redundant information.
| * 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
| | |/ | |/| | | | | | | | | | | | | Telehub commits! They will eat your babies and corrupt your database while they munch. DO NOT use anything from the first Telehub commit to this one. FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-231-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
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-233-48/+44
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-01-233-48/+44
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-221-0/+3
| | |\ \ \ | | | |/ /
| | | * | Add note about setting up test databasesBlueWall2012-01-221-0/+3
| | | |/
| | * | Fix up some parameter namingMelanie2012-01-221-2/+2
| | |/
| | * Finish connecting Telehub to databaseBlueWall2012-01-222-47/+25
| | |
| | * Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
| | |
* | | Fix llLookAt the right wayMelanie2012-01-231-19/+24
|/ /
* | Merge branch 'master' into careminsterMelanie2012-01-227-73/+350
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * 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
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-216-71/+341
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge branch 'master' into careminsterMelanie2012-01-2122-46/+762
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-2011-33/+149
| |\
| | * Revert "Change linux, windows and mac ODE libraries to use the GIMPACT ↵Justin Clark-Casey (justincc)2012-01-207-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | collider rather than OPCODE." This reverts commit 4eef6725f4116aa70de729b71d60636a7d0a68f5. Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances.
| | * Allow a viewer UDP image request retry to trigger another asset fetch if an ↵Justin Clark-Casey (justincc)2012-01-192-6/+32
| | | | | | | | | | | | | | | | | | existing fetch hasn't responded before a timeout. This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
| | * 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
| | |
| * | Telehub Support:BlueWall2012-01-207-4/+251
| |/ | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
| * Add "image queues clear <first-name> <last-name>" console commandJustin Clark-Casey (justincc)2012-01-192-15/+80
| | | | | | | | This allows a way to manually clear pending image queue requests for debug purposes
| * 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
| | | | | | | | | | | | Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
| | * 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
| | | | | | | | | | | | Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
| * | Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-197-12/+109
| |/
| * RegionReady:BlueWall2012-01-182-1/+7
| | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-173-1/+34
| |\
| | * Add function osGetGridCustomBlueWall2012-01-173-1/+34
| | | | | | | | | | | | Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
| * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-174-3/+92
| |\ \ | | |/
| | * Update osGetGrid**** functionsBlueWall2012-01-172-3/+75
| | | | | | | | | | | | The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
| | * 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 ↵Justin Clark-Casey (justincc)2012-01-177-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than OPCODE. As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe As before, the ODE revision used is r1755 - only the collider has changed. Tests so far reveal little performance change. However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list. The previous libraries are temporarily in bin/Physics-previous-ode-libs These can be copied back to bin if one wants to compare behaviour with the previous libraries.
* | | Add some loggingMelanie2012-01-171-0/+41
| | |
* | | Fix prim calculations so that > 32767 prims are supportedMelanie2012-01-172-3/+5
| | |
* | | Spin off NPC deletion into a thread to avoid it being done on a scriptMelanie2012-01-171-1/+3
| | | | | | | | | | | | microthread. A stab at fixing exceptions.
generated by cgit v1.1 at 2024-12-30 21:11:26 +0000