diff options
| author | Justin Clark-Casey (justincc) | 2013-02-15 00:28:00 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-15 00:28:00 +0000 |
| commit | 30a60d661f53b7370ce13c68d151cd399f2f6df6 (patch) | |
| tree | 220bddeac0454283a767834a77e541949fcb7414 /OpenSim/Region | |
| parent | Add regression TestJsonList2Path() (diff) | |
| parent | * Handle null check on configs in module startup so that the the code can be ... (diff) | |
| download | opensim-SC_OLD-30a60d661f53b7370ce13c68d151cd399f2f6df6.zip opensim-SC_OLD-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.gz opensim-SC_OLD-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.bz2 opensim-SC_OLD-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs index fb74cc6..f3436d1 100644 --- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging | |||
| 57 | try | 57 | try |
| 58 | { | 58 | { |
| 59 | IConfig statConfig = source.Configs["Statistics.Binary"]; | 59 | IConfig statConfig = source.Configs["Statistics.Binary"]; |
| 60 | if (statConfig.Contains("enabled") && statConfig.GetBoolean("enabled")) | 60 | if (statConfig != null && statConfig.Contains("enabled") && statConfig.GetBoolean("enabled")) |
| 61 | { | 61 | { |
| 62 | if (statConfig.Contains("collect_region_stats")) | 62 | if (statConfig.Contains("collect_region_stats")) |
| 63 | { | 63 | { |
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 385f5ad..cbffca7 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
| @@ -111,13 +111,15 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
| 111 | m_rpcPending = new Dictionary<UUID, RPCRequestInfo>(); | 111 | m_rpcPending = new Dictionary<UUID, RPCRequestInfo>(); |
| 112 | m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>(); | 112 | m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>(); |
| 113 | m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>(); | 113 | m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>(); |
| 114 | 114 | if (config.Configs["XMLRPC"] != null) | |
| 115 | try | ||
| 116 | { | ||
| 117 | m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort); | ||
| 118 | } | ||
| 119 | catch (Exception) | ||
| 120 | { | 115 | { |
| 116 | try | ||
| 117 | { | ||
| 118 | m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort); | ||
| 119 | } | ||
| 120 | catch (Exception) | ||
| 121 | { | ||
| 122 | } | ||
| 121 | } | 123 | } |
| 122 | } | 124 | } |
| 123 | 125 | ||