Move inventory contents configuration files to bin/inventory folder
parent
f64d94f8ca
commit
7cf9a8d4f9
|
@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||||
|
|
||||||
CreateLibraryItems();
|
CreateLibraryItems();
|
||||||
|
|
||||||
string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml");
|
string filePath = Path.Combine(Util.configDir(), "inventory/OpenSimLibrary.xml");
|
||||||
if (File.Exists(filePath))
|
if (File.Exists(filePath))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||||
}
|
}
|
||||||
catch (XmlException e)
|
catch (XmlException e)
|
||||||
{
|
{
|
||||||
MainLog.Instance.Error("INVENTORY", "Error loading " + filePath + ": " + e.ToString());
|
MainLog.Instance.Error("AGENTINVENTORY", "Error loading " + filePath + ": " + e.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,10 +149,10 @@ namespace OpenSim.Grid.InventoryServer
|
||||||
{
|
{
|
||||||
_manager = manager;
|
_manager = manager;
|
||||||
|
|
||||||
_inventory = loadInventoryFromXmlFile("Inventory_Library.xml");
|
_inventory = loadInventoryFromXmlFile("inventory/Inventory_Library.xml");
|
||||||
if (fixupInventory(_inventory))
|
if (fixupInventory(_inventory))
|
||||||
{
|
{
|
||||||
FileStream fs = new FileStream("Inventory_Library.xml", FileMode.Truncate, FileAccess.Write);
|
FileStream fs = new FileStream("inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write);
|
||||||
saveInventoryToStream(_inventory, fs);
|
saveInventoryToStream(_inventory, fs);
|
||||||
fs.Flush();
|
fs.Flush();
|
||||||
fs.Close();
|
fs.Close();
|
||||||
|
|
Loading…
Reference in New Issue