aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs50
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs16
2 files changed, 2 insertions, 64 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index be77341..9114e00 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -76,54 +76,6 @@ namespace OpenSim.Framework
76 set { m_physicalPrim = value; } 76 set { m_physicalPrim = value; }
77 } 77 }
78 78
79 private bool m_standaloneAuthenticate = false;
80
81 public bool StandaloneAuthenticate
82 {
83 get { return m_standaloneAuthenticate; }
84 set { m_standaloneAuthenticate = value; }
85 }
86
87 private string m_standaloneWelcomeMessage = null;
88
89 public string StandaloneWelcomeMessage
90 {
91 get { return m_standaloneWelcomeMessage; }
92 set { m_standaloneWelcomeMessage = value; }
93 }
94
95 private string m_standaloneInventoryPlugin;
96
97 public string StandaloneInventoryPlugin
98 {
99 get { return m_standaloneInventoryPlugin; }
100 set { m_standaloneInventoryPlugin = value; }
101 }
102
103 private string m_standaloneUserPlugin;
104
105 public string StandaloneUserPlugin
106 {
107 get { return m_standaloneUserPlugin; }
108 set { m_standaloneUserPlugin = value; }
109 }
110
111 private string m_standaloneInventorySource;
112
113 public string StandaloneInventorySource
114 {
115 get { return m_standaloneInventorySource; }
116 set { m_standaloneInventorySource = value; }
117 }
118
119 private string m_standaloneUserSource;
120
121 public string StandaloneUserSource
122 {
123 get { return m_standaloneUserSource; }
124 set { m_standaloneUserSource = value; }
125 }
126
127 protected string m_librariesXMLFile; 79 protected string m_librariesXMLFile;
128 public string LibrariesXMLFile 80 public string LibrariesXMLFile
129 { 81 {
@@ -146,4 +98,4 @@ namespace OpenSim.Framework
146 public const uint DefaultGridServerHttpPort = 8003; 98 public const uint DefaultGridServerHttpPort = 8003;
147 public const uint DefaultInventoryServerHttpPort = 8003; 99 public const uint DefaultInventoryServerHttpPort = 8003;
148 } 100 }
149} 101} \ No newline at end of file
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 40ab765..2d81ea8 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -372,21 +372,7 @@ namespace OpenSim
372 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 372 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
373 } 373 }
374 374
375 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
376 if (standaloneConfig != null)
377 {
378 m_configSettings.StandaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
379 m_configSettings.StandaloneWelcomeMessage = standaloneConfig.GetString("welcome_message");
380
381 m_configSettings.StandaloneInventoryPlugin = standaloneConfig.GetString("inventory_plugin");
382 m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source");
383 m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin");
384 m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source");
385
386 m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
387 }
388
389 m_networkServersInfo.loadFromConfiguration(m_config.Source); 375 m_networkServersInfo.loadFromConfiguration(m_config.Source);
390 } 376 }
391 } 377 }
392} 378} \ No newline at end of file