Added checks to the last commit to make sure the xml files exist before it tries to load them.
parent
cf203cf5ee
commit
369fb2e623
|
@ -36,9 +36,12 @@ namespace OpenSim.Framework.Communications.Caches
|
||||||
this.CreateLibraryItems();
|
this.CreateLibraryItems();
|
||||||
|
|
||||||
string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml");
|
string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml");
|
||||||
|
if (File.Exists(filePath))
|
||||||
|
{
|
||||||
XmlConfigSource source = new XmlConfigSource(filePath);
|
XmlConfigSource source = new XmlConfigSource(filePath);
|
||||||
this.ReadItemsFromFile(source);
|
this.ReadItemsFromFile(source);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void CreateLibraryItems()
|
private void CreateLibraryItems()
|
||||||
{
|
{
|
||||||
|
|
|
@ -361,9 +361,12 @@ namespace OpenSim.Region.GridInterfaces.Local
|
||||||
*/
|
*/
|
||||||
|
|
||||||
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
|
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
|
||||||
|
if(File.Exists(filePath))
|
||||||
|
{
|
||||||
XmlConfigSource source = new XmlConfigSource(filePath);
|
XmlConfigSource source = new XmlConfigSource(filePath);
|
||||||
ReadAssetDetails(source);
|
ReadAssetDetails(source);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected void ReadAssetDetails(IConfigSource source)
|
protected void ReadAssetDetails(IConfigSource source)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue