aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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.
* | | Merge branch 'master' into careminsterMelanie2012-01-160-0/+0
|\ \ \ | |/ /
| * | Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-167-2/+128
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-165-194/+24
|\ \ \ | |/ /
| * | Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-163-8/+8
| | | | | | | | | | | | | | | | | | adjustment commit. Left in the method doc.
| * | Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-165-193/+20
| |/ | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-167-2/+128
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-151-14/+24
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-151-14/+24
| |\ \ | | |/
| | * commented out redundant land owner checks for osTeleportAgent there isnebadon2012-01-141-14/+24
| | | | | | | | | | | | | | | | | | no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER also increased function to severe threat level to make it harder to accidently enable it for everyone.
* | | Disable using an agent ID to clone NPCs. The griefing potential is too greatMelanie2012-01-151-7/+7
|/ /
* | Fix mergeMelanie2012-01-142-61/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-1410-117/+269
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
| * Extend scripts show command to accept a single item UUID parameter to ↵Justin Clark-Casey (justincc)2012-01-141-40/+47
| | | | | | | | | | | | display one script's status Usage is now scripts show [<script-item-uuid>]
generated by cgit v1.1 at 2024-11-08 21:48:51 +0000