aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty/3Di
diff options
context:
space:
mode:
authorMW2008-06-26 17:20:08 +0000
committerMW2008-06-26 17:20:08 +0000
commit682ec53420ffac9918febc12b7140363602812e5 (patch)
treea3d45436d19e0388c9f52f7e4bc8058f52d71ec5 /ThirdParty/3Di
parentWORK-IN-PRGRESS: beware of falling pieces and shifting (diff)
downloadopensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.zip
opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.gz
opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.bz2
opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.xz
As per the suggestion on the mailing list, added support for a OpenSim.xml config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that.
Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).
Diffstat (limited to '')
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs6
-rw-r--r--ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 69b8fea..e22231c 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -79,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
79 { 79 {
80 m_log.Info("[BALANCER] " + "Entering Initialize()"); 80 m_log.Info("[BALANCER] " + "Entering Initialize()");
81 81
82 proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", ""); 82 proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
83 if (proxyURL.Length == 0) return; 83 if (proxyURL.Length == 0) return;
84 84
85 StartTcpServer(); 85 StartTcpServer();
@@ -93,8 +93,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
93 simMain = openSim; 93 simMain = openSim;
94 commandServer = openSim.HttpServer; 94 commandServer = openSim.HttpServer;
95 95
96 proxyOffset = Int32.Parse(openSim.ConfigSource.Configs["Network"].GetString("proxy_offset", "0")); 96 proxyOffset = Int32.Parse(openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));
97 serializeDir = openSim.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/"); 97 serializeDir = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");
98 98
99 commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion); 99 commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion);
100 commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move); 100 commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move);
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
index c9711c3..d8376b4 100644
--- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
+++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
@@ -72,7 +72,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
72 public void Initialise(OpenSimBase openSim) 72 public void Initialise(OpenSimBase openSim)
73 { 73 {
74 m_log.Info("Starting proxy"); 74 m_log.Info("Starting proxy");
75 string proxyURL = openSim.ConfigSource.Configs["Network"].GetString("proxy_url", ""); 75 string proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
76 if (proxyURL.Length == 0) return; 76 if (proxyURL.Length == 0) return;
77 77
78 uint port = (uint) Int32.Parse(proxyURL.Split(new char[] {':'})[2]); 78 uint port = (uint) Int32.Parse(proxyURL.Split(new char[] {':'})[2]);