diff options
| author | MW | 2007-08-08 17:29:37 +0000 |
|---|---|---|
| committer | MW | 2007-08-08 17:29:37 +0000 |
| commit | 369fb2e623acae2ad6ef0508a665d7622a39217d (patch) | |
| tree | 94b26323b6e457b46c4ff45a596d6675fefae708 /OpenSim/Region | |
| parent | The startup set of assets in the local asset server can now be set from a xml... (diff) | |
| download | opensim-SC-369fb2e623acae2ad6ef0508a665d7622a39217d.zip opensim-SC-369fb2e623acae2ad6ef0508a665d7622a39217d.tar.gz opensim-SC-369fb2e623acae2ad6ef0508a665d7622a39217d.tar.bz2 opensim-SC-369fb2e623acae2ad6ef0508a665d7622a39217d.tar.xz | |
Added checks to the last commit to make sure the xml files exist before it tries to load them.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs index 17d2680..eecfcaf 100644 --- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | |||
| @@ -361,8 +361,11 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
| 361 | */ | 361 | */ |
| 362 | 362 | ||
| 363 | string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); | 363 | string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); |
| 364 | if(File.Exists(filePath)) | ||
| 365 | { | ||
| 364 | XmlConfigSource source = new XmlConfigSource(filePath); | 366 | XmlConfigSource source = new XmlConfigSource(filePath); |
| 365 | ReadAssetDetails(source); | 367 | ReadAssetDetails(source); |
| 368 | } | ||
| 366 | } | 369 | } |
| 367 | 370 | ||
| 368 | protected void ReadAssetDetails(IConfigSource source) | 371 | protected void ReadAssetDetails(IConfigSource source) |