aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2013-02-282-9/+22
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-272-2/+2
| |
| * 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-02-101-6/+39
|\ \ | |/
| * Additional ThreadPool worker and IOCP thread startup logicAllen Kerensky2013-02-101-6/+39
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | 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 '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 'careminster' into avinationMelanie2012-11-232-5/+26
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-11-232-5/+26
| |\ \ | | |/ | | | | | | | | | | | | 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-232-5/+26
| | | | | | | | | | | | | | | | | | 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-223-223/+30
|\ \ | |/
| * 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-223-171/+29
| |
| * 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
| * 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
generated by cgit v1.1 at 2024-12-25 22:17:55 +0000