aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigSettings.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-29 16:56:48 +0000
committerJustin Clarke Casey2008-12-29 16:56:48 +0000
commit266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 (patch)
tree45f2ad93db485b5144c3fc86662891432c3a877a /OpenSim/Framework/ConfigSettings.cs
parentRevamp the return logic to close a privilege escalation loophole. (diff)
downloadopensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.zip
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.gz
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.bz2
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes
* This allows configuration of the assetset and library control file paths to be other than ./inventory/Libraries.xml and ./assets/AssetSets.xml * This is controlled via the LibrariesXMLFile and AssetSetsXMLFile configuration settings in [StandAlone] in OpenSim.ini (in standalone) and via the user and asset config xml files for grid mode * Thanks to SirKimba for the patch
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs25
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 02b8465..3d66311 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -179,5 +179,30 @@ namespace OpenSim.Framework
179 get { return m_dumpAssetsToFile; } 179 get { return m_dumpAssetsToFile; }
180 set { m_dumpAssetsToFile = value; } 180 set { m_dumpAssetsToFile = value; }
181 } 181 }
182
183 protected string m_librariesXMLFile;
184 public string LibrariesXMLFile
185 {
186 get
187 {
188 return m_librariesXMLFile;
189 }
190 set
191 {
192 m_librariesXMLFile = value;
193 }
194 }
195 protected string m_assetSetsXMLFile;
196 public string AssetSetsXMLFile
197 {
198 get
199 {
200 return m_assetSetsXMLFile;
201 }
202 set
203 {
204 m_assetSetsXMLFile = value;
205 }
206 }
182 } 207 }
183} 208}