aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2008-06-28 15:13:17 +0000
committerMW2008-06-28 15:13:17 +0000
commit86defd0a69d53df6d352b7d4b9a5b9d6621c19e8 (patch)
tree111e3144f54437d74650704d0a299451ed1a0e7a /OpenSim/Region/Application
parentRemove one warning. We are now down to 16 warnings in (diff)
downloadopensim-SC-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.zip
opensim-SC-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.gz
opensim-SC-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.bz2
opensim-SC-86defd0a69d53df6d352b7d4b9a5b9d6621c19e8.tar.xz
plumbing for multiple inventory servers. Mostly done on the region server side.
TODO next is to make the login server read/write a users inventory from the correct server (the inventory url set in a userprofile) On the region side, although not tested with multiple servers it should work if that inventory url was set, and the inventory servers urls have been added to the CommunicationsManager, using CommunicationsManager.AddInventoryService(string hostUrl)
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index aecf2df..06b4de7 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -173,7 +173,7 @@ namespace OpenSim
173 { 173 {
174 if (File.Exists("OpenSim.xml")) 174 if (File.Exists("OpenSim.xml"))
175 { 175 {
176 //chech for a xml config file 176 //check for a xml config file
177 Application.iniFilePath = "OpenSim.xml"; 177 Application.iniFilePath = "OpenSim.xml";
178 m_config.Source = new XmlConfigSource(); 178 m_config.Source = new XmlConfigSource();
179 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); 179 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));