aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-151-0/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-141-0/+1
| | | | | | | | simulator logs, for debug purposes
* | Merge branch 'master' into careminsterMelanie2013-02-281-8/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-271-1/+1
| |
| * Get "show modules" console command to show modules in alphabetical order, ↵Justin Clark-Casey (justincc)2013-02-271-7/+20
| | | | | | | | | | | | and group shared and non-shared modules together This is to make it easier to tell if a region has a certain module active or not
* | Merge branch 'master' into careminsterMelanie2013-01-111-37/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-37/+0
| | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * minor: add missing newline to "debug scene" console commandJustin Clark-Casey (justincc)2013-01-101-1/+1
| |
| * Remove unimplemented "debug teleport" console commandJustin Clark-Casey (justincc)2013-01-101-2/+0
| |
| * Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-4/+6
| | | | | | | | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-231-0/+20
| | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
* | Merge branch 'master' into careminsterMelanie2012-11-221-179/+6
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-36/+0
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-221-128/+6
| |
| * Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-16/+1
| | | | | | | | This helpfully lists version information, startup location and console log level
* | Merge branch 'master' into careminsterMelanie2012-11-121-43/+4
|\ \ | |/ | | | | | | | | | | | | | | 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-121-43/+4
| |
* | 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-121-3/+10
|\ \ | |/ | | | | | | | | | | 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.
* | 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 '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-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-07-281-37/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+1
| | | | | | | | 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-251-36/+36
| | | | | | | | | | | | | | | | 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-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.
| * minor: Extend 'debug http' usage statement to 0..3 from 0..2Justin Clark-Casey (justincc)2012-06-141-1/+1
| |
| * Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵Justin Clark-Casey (justincc)2012-06-141-4/+5
| | | | | | | | warn to be logged if we receive invalid xml for xmlrpc.
* | Merge branch 'master' into careminsterMelanie2012-06-131-1/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs