ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-19 22:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,956 Commits 5 Branches 87 Tags
71fc9f29f92edf2956ecb25dcbcdb97d262c8a14
Commit Graph

1028 Commits

Author SHA1 Message Date
Melanie
01f06b90dd Merge branch 'careminster' into avination 2012-11-23 03:42:04 +00:00
Melanie
ae8733bf59 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-23 03:39:49 +00:00
Justin Clark-Casey (justincc)
8c8c8a00a4 Fix problem where restarting the currently selected region would stop 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.
 2012-11-23 02:22:30 +00:00
Melanie
442896cb1d Remove duplicate registration of the help topics for the module commander 2012-11-23 02:44:51 +01:00
Melanie
3c1a58c67a Merge branch 'master' into careminster 2012-11-22 13:37:27 +00:00
Justin Clark-Casey (justincc)
3ce00e97cc Factor out command script code. 
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
 2012-11-22 05:57:20 +00:00
Justin Clark-Casey (justincc)
9fcf3f1a3f Make "config show/set/get/save" console commands available on all servers 2012-11-22 05:48:41 +00:00
Justin Clark-Casey (justincc)
45d1e6ab09 Make "show info" command available across all servers 
This helpfully lists version information, startup location and console log level
 2012-11-22 04:45:53 +00:00
Justin Clark-Casey (justincc)
5c48d7a378 factor out common HandleShow code for "show uptime" 2012-11-22 04:05:09 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Justin Clark-Casey (justincc)
2ccb53b42d If no ISimulationDataStore or IEstateDataStore implementations could be 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.
 2012-11-14 04:17:39 +00:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
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
 2012-11-12 23:27:47 +00:00
Melanie
8c130bcaf5 Remove the old style module loader and all references to it 2012-11-12 22:50:28 +00:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
Justin Clark-Casey (justincc)
09f4e72d6a Fix memory leak where removing an NPC did not remove its circuits. 
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.
 2012-10-29 23:22:40 +00:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
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
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
16809bd0ea minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious. 2012-10-26 02:36:58 +01:00
Melanie
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
b5a3c74a5c Add "active true|false" to "debug scene" console command. 
This allows the scene update and maintenance loops to be started and stopped for debug purposes.
 2012-10-12 02:52:08 +01:00
Justin Clark-Casey (justincc)
1f2472d0fc Extend "show stats" command to "show stats [list|all|<category name>]" 
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.
 2012-10-11 23:28:53 +01:00
Melanie
7cc89cdadc Add using clause I missed 2012-09-30 15:57:49 +01:00
Melanie
f8a4b61954 Allow up to 12 simultaneous connections to a given endpoint rather than 2 2012-09-30 15:49:51 +01:00
Melanie
66bf1376b5 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
 2012-09-16 04:21:18 +01:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Oren Hurvitz
ce468215d5 Support multi-region OAR files 
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.
 2012-09-14 20:25:03 +01:00
Melanie
45fe25de0d Allow some more connections to try to ease lag. 2012-09-14 00:14:39 +02:00
Justin Clark-Casey (justincc)
d53a53d4c5 Make "show http-handlers" command available for ROBUST instances as well as the simulator executable. 2012-09-12 00:10:48 +01:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie
afb4e06f63 Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) 2012-09-09 17:41:10 +02:00
Melanie
b379e790a2 Set the maximum number of concurrent connections to a service endpoint 
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
 2012-09-07 23:27:40 +02:00
Melanie
f8603a215d Merge branch 'master' into careminster 
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
 2012-08-23 01:41:47 +01:00
Justin Clark-Casey (justincc)
e6fb458597 no-op change for cia.vc test 2012-08-20 22:18:29 +01:00
Justin Clark-Casey (justincc)
bcbd450fe4 Add --force flag to "kick user" console command to allow bypassing of recent 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.
 2012-08-20 20:24:54 +01:00
Melanie
90ad98370a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-16 02:46:48 +01:00
Justin Clark-Casey (justincc)
5a1b6fdf06 Don't enable the thread watchdog until all regions are ready. 
This is to avoid false positives when the machine is under heavy load whilst starting up.
 2012-08-15 22:43:32 +01:00
Melanie
b9c4a637b4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc)
374ebab574 Strip experimental tag from --publish option of "save oar" region console command 2012-08-03 23:54:17 +01:00
Melanie
ecffcf7f65 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Physics/Manager/PhysicsScene.cs
 2012-08-01 23:03:03 +01:00
Melanie
cf16ca9bda Create the ability for physics modules to request assets on demand by 
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.
 2012-08-01 22:37:38 +01:00
Melanie
771d79e83e Merge branch 'master' into careminster 
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
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Justin Clark-Casey (justincc)
a1e99642c1 Add experimental "OpenSim object memory churn" statistics to output of 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.
 2012-07-25 22:29:40 +01:00
Melanie
7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc)
be39f03caa minor: switch around mixed up circuit code and endpoint data in "show connections" region console command 2012-07-19 23:35:56 +01:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
15283d35f1 Extend "show circuits" to show circuit code, ip and viewer name. 
Also change to use standard table formatting
"show circuits" and "show connections" console commands are very similar but access different data structures.
 2012-07-12 23:09:36 +01:00
Justin Clark-Casey (justincc)
6a0de355e0 Add active status to "show connections" 2012-07-12 22:37:48 +01:00
Justin Clark-Casey (justincc)
ca412032e8 Put output for "show connections" command into standard table format. 
Also moves into own method.
 2012-07-12 21:36:33 +01:00
Melanie
0bc8238a6c Merge branch 'master' into careminster 
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
 2012-07-11 03:56:50 +01:00
Justin Clark-Casey (justincc)
843112340e Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set 2012-07-06 00:37:45 +01:00