aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-15 00:28:00 +0000
committerJustin Clark-Casey (justincc)2013-02-15 00:28:00 +0000
commit30a60d661f53b7370ce13c68d151cd399f2f6df6 (patch)
tree220bddeac0454283a767834a77e541949fcb7414 /OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
parentAdd regression TestJsonList2Path() (diff)
parent* Handle null check on configs in module startup so that the the code can be ... (diff)
downloadopensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.zip
opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.gz
opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.bz2
opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs14
1 files changed, 8 insertions, 6 deletions
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