mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
* 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
This commit is contained in:
@@ -40,6 +40,7 @@ namespace OpenSim.Framework
|
||||
public string DatabaseConnect = String.Empty;
|
||||
public string DatabaseProvider = String.Empty;
|
||||
public uint HttpPort = DefaultHttpPort;
|
||||
public string AssetSetsLocation = string.Empty;
|
||||
|
||||
public AssetConfig(string description, string filename)
|
||||
{
|
||||
@@ -58,6 +59,10 @@ namespace OpenSim.Framework
|
||||
|
||||
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
|
||||
"Http Listener port", DefaultHttpPort.ToString(), false);
|
||||
|
||||
configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
|
||||
"Location of 'AssetSets.xml'",
|
||||
string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false);
|
||||
}
|
||||
|
||||
public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
|
||||
@@ -70,6 +75,9 @@ namespace OpenSim.Framework
|
||||
case "database_connect":
|
||||
DatabaseConnect = (string) configuration_result;
|
||||
break;
|
||||
case "assetset_location":
|
||||
AssetSetsLocation = (string) configuration_result;
|
||||
break;
|
||||
case "http_port":
|
||||
HttpPort = (uint) configuration_result;
|
||||
break;
|
||||
@@ -78,4 +86,4 @@ namespace OpenSim.Framework
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user