aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-24/+16
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-081-1/+1
| | |
| * | Reinstate SecurePermissionsLoading functionality, default ONMelanie Thielker2013-09-081-24/+16
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-111-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add a JSON web fetch of the statististics managed by StatsManager.Robert Adams2013-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled by default. Enable by setting [Startup]ManagedStatsRemoteFetchURI="Something" and thereafter "http://ServerHTTPPort/Something/" will return all the managed stats (equivilent to "show stats all" console command). Accepts queries "cat=", "cont=" and "stat=" to specify statistic category, container and statistic names. The special name "all" is the default and returns all values in that group.
* | | Merge branch 'master' into careminsterMelanie2013-07-181-57/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
| * | refactor: Make stats and sim status simpler by extending BaseStreamHandler ↵Justin Clark-Casey (justincc)2013-07-061-57/+17
| | | | | | | | | | | | like other handlers instead of implementing the IStreamedRequestHandler interface directly
* | | Merge branch 'master' into careminsterMelanie2013-06-231-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Make general server stats available on the robust console as well as the ↵Justin Clark-Casey (justincc)2013-06-171-4/+3
| | | | | | | | | | | | | | | | | | simulator console This means the "show stats" command is now active on the robust console.
* | | Merge branch 'master' into careminsterMelanie2013-05-041-3/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-031-3/+1
| | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
* | | Merge branch 'master' into careminsterMelanie2013-04-161-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵Justin Clark-Casey (justincc)2013-04-161-1/+1
| | | | | | | | | | | | | | Stop(). This was an undocumented interface which I think was for long defunct region load balancing experiments. Also adds method doc for some IClientNetworkServer methods.
* | Merge branch 'master' into careminsterMelanie2013-03-151-4/+0
|\ \ | |/ | | | | | | | | 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-4/+0
| | | | | | | | simulator logs, for debug purposes
* | Merge branch 'master' into careminsterMelanie2013-03-011-0/+4
|\ \ | |/
| * minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-281-0/+4
| | | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
* | Merge branch 'master' into careminsterMelanie2013-02-281-1/+1
|\ \ | |/ | | | | | | 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
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ \ | |/
| * Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-041-15/+22
|\ \ | |/
| * Adds the ability to load more then one IClientNetworkServer thereby allowing ↵teravus2013-02-031-15/+22
| | | | | | | | additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.
* | Merge branch 'careminster' into avinationMelanie2012-11-231-5/+6
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-11-231-5/+6
| |\ \ | | |/ | | | | | | | | | | | | 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-5/+6
| | | | | | | | | | | | | | | | | | 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.
* | | Remove duplicate registration of the help topics for the module commanderMelanie2012-11-231-5/+5
|/ /
* | Merge branch 'master' into careminsterMelanie2012-11-221-43/+24
|\ \ | |/
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-221-42/+23
| |
| * 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-121-47/+24
|\ \ | |/ | | | | | | | | | | | | | | 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-25/+1
| |
* | 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-121-37/+35
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * 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.
* | 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-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-281-18/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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-17/+19
| | | | | | | | | | | | | | | | 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-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
generated by cgit v1.1 at 2024-12-18 14:26:48 +0000