Shift default OpenSim library into its own directory

3 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 7ff2c97..20ec58a 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Cache
 
             CreateLibraryItems();
 
-            string filePath = Path.Combine(Util.configDir(), "inventory/OpenSimLibrary.xml");
+            string filePath = Path.Combine(Util.configDir(), "inventory/OpenSimLibrary/OpenSimLibrary.xml");
             if (File.Exists(filePath))
             {
                 try
diff --git a/bin/inventory/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
index b46c6ec..b46c6ec 100644
--- a/bin/inventory/OpenSimLibrary.xml
+++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
diff --git a/bin/inventory/README.txt b/bin/inventory/README.txt
new file mode 100644
index 0000000..003a18a
--- /dev/null
+++ b/bin/inventory/README.txt
@@ -0,0 +1,6 @@
+README
+
+Inventory configuration is carried out here.  Currently, you can add new items to OpenSimLibrary/OpenSimLibrary.xml,
+as long as they have a corresponding asset entry in bin/OpenSimAssetSet.xml.
+
+Inventory_Default.xml and Inventory_Library.xml are unused at the moment.