diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 63 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | 12 |
3 files changed, 69 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 8934be2..223b4a5 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -720,6 +720,9 @@ namespace OpenSim | |||
720 | m_log.Error("show modules - shows info aboutloaded modules."); | 720 | m_log.Error("show modules - shows info aboutloaded modules."); |
721 | m_log.Error("stats - statistical information for this server not displayed in the client"); | 721 | m_log.Error("stats - statistical information for this server not displayed in the client"); |
722 | m_log.Error("shutdown - disconnect all clients and shutdown."); | 722 | m_log.Error("shutdown - disconnect all clients and shutdown."); |
723 | m_log.Error("config set category field value - set a config value"); | ||
724 | m_log.Error("config get category field - get a config value"); | ||
725 | m_log.Error("config save - save OpenSim.ini"); | ||
723 | m_log.Error("terrain help - show help for terrain commands."); | 726 | m_log.Error("terrain help - show help for terrain commands."); |
724 | break; | 727 | break; |
725 | 728 | ||
@@ -911,8 +914,66 @@ namespace OpenSim | |||
911 | MainLog.Instance.Notice("STATS", "Extra statistics collection has not been enabled"); | 914 | MainLog.Instance.Notice("STATS", "Extra statistics collection has not been enabled"); |
912 | } | 915 | } |
913 | break; | 916 | break; |
914 | |||
915 | 917 | ||
918 | case "config": | ||
919 | string n = command.ToUpper(); | ||
920 | if (cmdparams.Length > 0) | ||
921 | { | ||
922 | switch (cmdparams[0].ToLower()) | ||
923 | { | ||
924 | case "set": | ||
925 | if (cmdparams.Length < 4) | ||
926 | { | ||
927 | MainLog.Instance.Notice(n, "SYNTAX: " + n + " SET SECTION KEY VALUE"); | ||
928 | MainLog.Instance.Notice(n, "EXAMPLE: " + n + " SET ScriptEngine.DotNetEngine NumberOfScriptThreads 5"); | ||
929 | } | ||
930 | else | ||
931 | { | ||
932 | IConfig c = DefaultConfig().Configs[cmdparams[1]]; | ||
933 | if (c == null) | ||
934 | c = DefaultConfig().AddConfig(cmdparams[1]); | ||
935 | string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3); | ||
936 | c.Set(cmdparams[2], _value); | ||
937 | m_config.Merge(c.ConfigSource); | ||
938 | |||
939 | MainLog.Instance.Notice(n, | ||
940 | n + " " + n + " " + cmdparams[1] + " " + cmdparams[2] + " " + | ||
941 | _value); | ||
942 | } | ||
943 | break; | ||
944 | case "get": | ||
945 | if (cmdparams.Length < 3) | ||
946 | { | ||
947 | MainLog.Instance.Notice(n, "SYNTAX: " + n + " GET SECTION KEY"); | ||
948 | MainLog.Instance.Notice(n, "EXAMPLE: " + n + " GET ScriptEngine.DotNetEngine NumberOfScriptThreads"); | ||
949 | } | ||
950 | else | ||
951 | { | ||
952 | IConfig c = DefaultConfig().Configs[cmdparams[1]]; | ||
953 | if (c == null) | ||
954 | { | ||
955 | MainLog.Instance.Notice(n, "Section \"" + cmdparams[1] + "\" does not exist."); | ||
956 | break; | ||
957 | } | ||
958 | else | ||
959 | { | ||
960 | MainLog.Instance.Notice(n, | ||
961 | n + " GET " + cmdparams[1] + " " + cmdparams[2] + ": " + | ||
962 | c.GetString(cmdparams[2])); | ||
963 | } | ||
964 | } | ||
965 | |||
966 | break; | ||
967 | case "save": | ||
968 | MainLog.Instance.Notice(n, "Saving configuration file: " + Application.iniFilePath); | ||
969 | m_config.Save(Application.iniFilePath); | ||
970 | break; | ||
971 | } | ||
972 | } | ||
973 | else | ||
974 | { | ||
975 | } | ||
976 | break; | ||
916 | default: | 977 | default: |
917 | m_log.Error("Unknown command"); | 978 | m_log.Error("Unknown command"); |
918 | break; | 979 | break; |
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index e292c2c..0fd3486 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -257,7 +257,7 @@ namespace OpenSim.Region.ClientStack | |||
257 | { | 257 | { |
258 | 258 | ||
259 | uint newPort = listenPort; | 259 | uint newPort = listenPort; |
260 | for (uint i = 0; i < 10; i++) | 260 | for (uint i = 0; i < 20; i++) |
261 | { | 261 | { |
262 | newPort = listenPort + i; | 262 | newPort = listenPort + i; |
263 | m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ". Allow alternate ports: " + Allow_Alternate_Port.ToString()); | 263 | m_log.Verbose("SERVER", "Opening UDP socket on " + listenIP.ToString() + " " + newPort + ". Allow alternate ports: " + Allow_Alternate_Port.ToString()); |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index 0b58da0..4cf39b4 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -134,14 +134,14 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
134 | #if DEBUG | 134 | #if DEBUG |
135 | Log.Debug(ScriptEngineName, "Refreshing configuration for all modules"); | 135 | Log.Debug(ScriptEngineName, "Refreshing configuration for all modules"); |
136 | #endif | 136 | #endif |
137 | RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0); | 137 | RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30); |
138 | 138 | ||
139 | // Reload from disk | 139 | // Reload from disk? No! |
140 | //ConfigSource.Reload(); | 140 | //ConfigSource.Reload(); |
141 | if (File.Exists(OpenSim.Application.iniFilePath)) | 141 | //if (File.Exists(OpenSim.Application.iniFilePath)) |
142 | { | 142 | //{ |
143 | //ConfigSource.Merge(new IniConfigSource(OpenSim.Application.iniFilePath)); | 143 | // //ConfigSource.Merge(new IniConfigSource(OpenSim.Application.iniFilePath)); |
144 | } | 144 | //} |
145 | 145 | ||
146 | 146 | ||
147 | // Create a new object (probably not necessary?) | 147 | // Create a new object (probably not necessary?) |