aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * factor out common HandleShow code for "show uptime"Justin Clark-Casey (justincc)2012-11-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+14
|\ \ | |/
| * If no ISimulationDataStore or IEstateDataStore implementations could be ↵Justin Clark-Casey (justincc)2012-11-141-0/+14
| | | | | | | | | | | | | | loaded then halt with informative message rather than a later NRE. Halt already occurs if the relevant config sections are not present. So it also makes sense to halt if the implementations themselves cannot be loaded.
* | Merge branch 'master' into careminsterMelanie2012-11-122-90/+28
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Remove the old style module loader and all references to itMelanie2012-11-122-68/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-10-301-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-1/+1
| | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
* | Merge branch 'master' into careminsterMelanie2012-10-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * minor: Make the error thrown logged when a simulator in grid mode is trying ↵Justin Clark-Casey (justincc)2012-10-261-1/+1
| | | | | | | | to set estate owner to a user that doesn't exist a little more obvious.
* | Merge branch 'master' into careminsterMelanie2012-10-122-40/+45
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-121-3/+10
| | | | | | | | This allows the scene update and maintenance loops to be started and stopped for debug purposes.
| * Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-37/+35
| | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
| * Add using clause I missedMelanie2012-09-301-0/+1
| |
| * Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-09-161-1/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Allow some more connections to try to ease lag.Melanie2012-09-141-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-161-32/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Support multi-region OAR filesOren Hurvitz2012-09-141-1/+2
| | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| * | Make "show http-handlers" command available for ROBUST instances as well as ↵Justin Clark-Casey (justincc)2012-09-121-31/+0
| | | | | | | | | | | | the simulator executable.
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-0/+2
|\ \ \ | | |/ | |/|
| * | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)Melanie2012-09-091-1/+1
| | |
| * | Set the maximum number of concurrent connections to a service endpointMelanie2012-09-071-0/+2
| | | | | | | | | | | | | | | to 50. This doesn't work on stock mono but it works in Avination and also under Windoze.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-7/+18
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * no-op change for cia.vc testJustin Clark-Casey (justincc)2012-08-201-0/+1
| |
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-7/+17
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | Merge branch 'master' into careminsterMelanie2012-08-161-2/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-151-2/+7
| | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up.
* | Merge branch 'master' into careminsterMelanie2012-08-041-8/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Strip experimental tag from --publish option of "save oar" region console ↵Justin Clark-Casey (justincc)2012-08-031-8/+7
| | | | | | | | command
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+1
| | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
* | Merge branch 'master' into careminsterMelanie2012-07-282-55/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-252-53/+55
| | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it.
* | Merge branch 'master' into careminsterMelanie2012-07-201-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: switch around mixed up circuit code and endpoint data in "show ↵Justin Clark-Casey (justincc)2012-07-191-1/+1
| | | | | | | | connections" region console command
* | Merge branch 'master' into careminsterMelanie2012-07-131-35/+49
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-121-20/+31
| | | | | | | | | | Also change to use standard table formatting "show circuits" and "show connections" console commands are very similar but access different data structures.
| * Add active status to "show connections"Justin Clark-Casey (justincc)2012-07-121-1/+7
| |
| * Put output for "show connections" command into standard table format.Justin Clark-Casey (justincc)2012-07-121-19/+16
| | | | | | | | Also moves into own method.
* | Merge branch 'master' into careminsterMelanie2012-07-111-2/+6
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not setJustin Clark-Casey (justincc)2012-07-061-2/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-06-281-56/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Replace "kill uuid" console command with the more consistent "delete object ↵Justin Clark-Casey (justincc)2012-06-261-56/+0
| | | | | | | | uuid", which was present in the last opensim release.
* | Merge branch 'master' into careminsterMelanie2012-06-151-3/+3
|\ \ | |/
| * Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-3/+3
| | | | | | | | scattering them over other categories
* | Merge branch 'master' into careminsterMelanie2012-06-151-23/+2
|\ \ | |/
| * Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-151-32/+2
| | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
| * minor: Tell user the current debug http level if "debug http" console ↵Justin Clark-Casey (justincc)2012-06-151-3/+11
| | | | | | | | command is executed without a level parameter
| * When setting debug http level, do this for all known http servers, not just ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | the main instance.