small change to last commit

author: MW 2008-06-26 17:23:05 +0000
committer: MW 2008-06-26 17:23:05 +0000
commit: 314181a70d00d99506d3752653f1b0b87512ea44 (patch)
tree: b1d048f6635209506642256c082004981e1585e2 /ThirdParty/3Di
parent: As per the suggestion on the mailing list, added support for a OpenSim.xml co... (diff)
download: opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.zip
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.gz
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.bz2
opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.xz
2 files changed, 4 insertions, 4 deletions
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index e22231c..2aa2398 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -79,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
        {
            m_log.Info("[BALANCER] " + "Entering Initialize()");
-            proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
+            proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
            if (proxyURL.Length == 0) return;
            StartTcpServer();
@@ -93,8 +93,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
            simMain = openSim;
            commandServer = openSim.HttpServer;
-            proxyOffset = Int32.Parse(openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));
+            proxyOffset = Int32.Parse(openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_offset", "0"));
-            serializeDir = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");
+            serializeDir = openSim.ConfigSource.Source.Configs["Network"].GetString("serialize_dir", "/tmp/");
            commandServer.AddXmlRPCHandler("SerializeRegion", SerializeRegion);
            commandServer.AddXmlRPCHandler("DeserializeRegion_Move", DeserializeRegion_Move);
diff --git a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
index d8376b4..9bb883e 100644
--- a/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
+++ b/ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs
@@ -72,7 +72,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
        public void Initialise(OpenSimBase openSim)
        {
            m_log.Info("Starting proxy");
-            string proxyURL = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("proxy_url", "");
+            string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
            if (proxyURL.Length == 0) return;
            uint port = (uint) Int32.Parse(proxyURL.Split(new char[] {':'})[2]);
author	MW	2008-06-26 17:23:05 +0000
committer	MW	2008-06-26 17:23:05 +0000
commit	314181a70d00d99506d3752653f1b0b87512ea44 (patch)
tree	b1d048f6635209506642256c082004981e1585e2 /ThirdParty/3Di
parent	As per the suggestion on the mailing list, added support for a OpenSim.xml co... (diff)
download	opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.zip opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.gz opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.bz2 opensim-SC_OLD-314181a70d00d99506d3752653f1b0b87512ea44.tar.xz

diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index e22231c..2aa2398 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.ConfigSource.Configs["Network"].GetString("proxy_url", "");	82	proxyURL = openSim.ConfigSource.Source.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.ConfigSource.Configs["Network"].GetString("proxy_offset", "0"));	96	proxyOffset = Int32.Parse(openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_offset", "0"));
97	serializeDir = openSim.ConfigSource.ConfigSource.Configs["Network"].GetString("serialize_dir", "/tmp/");	97	serializeDir = openSim.ConfigSource.Source.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 d8376b4..9bb883e 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.ConfigSource.Configs["Network"].GetString("proxy_url", "");	75	string proxyURL = openSim.ConfigSource.Source.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]);