aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * 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
| * Add variable timer configureation for the timer_ScriptBlueWall2012-06-121-1/+6
| | | | | | | | Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
* | Merge branch 'master' into careminsterMelanie2012-06-091-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and ↵Justin Clark-Casey (justincc)2012-06-081-0/+2
| | | | | | | | json stats from working
| * Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-2/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-06-081-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Go back to calling IncomingCloseAgent() in the "kick user" command for ↵Justin Clark-Casey (justincc)2012-06-081-1/+1
| | | | | | | | | | | | consistency instead of IClientAPI.Close() directly. This no longer double counts child agent removals
* | Merge branch 'master' into careminsterMelanie2012-06-081-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-081-2/+2
| | | | | | | | | | This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close() DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
* | Merge branch 'master' into careminsterMelanie2012-06-071-3/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Allow the thread watchdog to accept an alarm method that is invoked if the ↵Justin Clark-Casey (justincc)2012-06-071-3/+7
| | | | | | | | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
* | Merge branch 'master' into careminsterMelanie2012-06-061-29/+49
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Add replaceable region modules to the "show modules" commandBlueWall2012-06-041-29/+49
| |
* | Merge branch 'master' into careminsterMelanie2012-05-311-1/+2
|\ \ | |/
| * Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
* | Merge branch 'master' into careminsterMelanie2012-05-102-7/+10
|\ \ | |/
| * Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-102-7/+10
| | | | | | | | | | | | | | | | | | | | completely rewritten every time a region starts up. This makes the data write only when the data was not already read from the database. There is a still a major race condition whenever two regions share the same estate data, but at least it won't be triggered on startup.
* | Merge branch 'master' into careminsterMelanie2012-05-051-1/+10
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-1/+10
| | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | Merge branch 'master' into careminsterMelanie2012-04-291-4/+4
|\ \ | |/
| * Put scene object related console commands into new "Objects" help category ↵Justin Clark-Casey (justincc)2012-04-281-4/+4
| | | | | | | | rather than "Regions"
* | Merge branch 'master' into careminsterMelanie2012-03-251-5/+6
|\ \ | |/
| * Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-241-5/+6
| | | | | | | | | | Forcing uppercase (e.g. help Assets) is too annoying. Thanks to WhiteStar for pointing this out.
* | Merge branch 'master' into careminsterMelanie2012-03-231-2/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Rename Scene.StartTimer() to Start() - this method no longer uses a timer. ↵Justin Clark-Casey (justincc)2012-03-231-1/+1
| | | | | | | | Comment out more effectively unused old heartbeat code.
* | Merge branch 'master' into careminsterMelanie2012-03-221-26/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Incorporate scene teleporting debugging into "debug scene teleport ↵Justin Clark-Casey (justincc)2012-03-211-16/+1
| | | | | | | | true|false" command
| * Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-211-11/+8
| | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
* | Merge branch 'master' into careminsterMelanie2012-03-181-1/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
| | | | | | | | These can start with ; # or //
* | Merge branch 'master' into careminsterMelanie2012-03-111-67/+152
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
| | | | | | | | | | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
* | Merge branch 'master' into careminsterMelanie2012-03-082-59/+48
|\ \ | |/
| * Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| |
generated by cgit v1.1 at 2024-12-18 16:51:34 +0000