aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetConfig.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/AssetConfig.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/AssetConfig.cs')
-rw-r--r--OpenSim/Framework/AssetConfig.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 9ae98d7..cc0217f 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Framework
40 public string DatabaseConnect = String.Empty; 40 public string DatabaseConnect = String.Empty;
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public uint HttpPort = DefaultHttpPort; 42 public uint HttpPort = DefaultHttpPort;
43 public string AssetSetsLocation = string.Empty;
43 44
44 public AssetConfig(string description, string filename) 45 public AssetConfig(string description, string filename)
45 { 46 {
@@ -58,6 +59,10 @@ namespace OpenSim.Framework
58 59
59 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 60 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
60 "Http Listener port", DefaultHttpPort.ToString(), false); 61 "Http Listener port", DefaultHttpPort.ToString(), false);
62
63 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
64 "Location of 'AssetSets.xml'",
65 string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false);
61 } 66 }
62 67
63 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 68 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -70,6 +75,9 @@ namespace OpenSim.Framework
70 case "database_connect": 75 case "database_connect":
71 DatabaseConnect = (string) configuration_result; 76 DatabaseConnect = (string) configuration_result;
72 break; 77 break;
78 case "assetset_location":
79 AssetSetsLocation = (string) configuration_result;
80 break;
73 case "http_port": 81 case "http_port":
74 HttpPort = (uint) configuration_result; 82 HttpPort = (uint) configuration_result;
75 break; 83 break;
@@ -78,4 +86,4 @@ namespace OpenSim.Framework
78 return true; 86 return true;
79 } 87 }
80 } 88 }
81} \ No newline at end of file 89}