Standard library folders can now be configued in the xml in inventory/OpenSimLibrary - no hardcoded changes are required. For some reason, all the folders are currently

showing up as texture folders, even though they are configured with the same types as the agent inventory folders.  This should be resolved soon.

3 files changed, 47 insertions, 5 deletions

diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
index b46c6ec..7f5baa9 100644
--- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
+++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
@@ -1,6 +1,22 @@
 <Nini>
   <!-- the root Opensim Library folder ID is 00000112-000f-0000-0000-000100bba000 -->
 
+<!--
+  <Section Name="Fart notecard">
+    <Key Name="inventoryID" Value="30000000-0000-2222-4444-000000000001" />
+    <Key Name="assetID" Value="30000000-0000-2222-3333-000000000001" />
+    <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba001"/>
+    <Key Name="description" Value="ha" />
+    <Key Name="name" Value="Fart" />
+    <Key Name="assetType" Value="7" />
+    <Key Name="inventoryType" Value="7" />
+    <Key Name="currentPermissions" Value="2147483647" />
+    <Key Name="nextPermissions" Value="2147483647" />
+    <Key Name="everyonePermissions" Value="2147483647" />
+    <Key Name="basePermissions" Value="2147483647" />
+  </Section>
+-->
+
   <Section Name="Welcome notecard">
     <Key Name="inventoryID" Value="00000000-0000-2222-4444-000000000001" />
     <Key Name="assetID" Value="00000000-0000-2222-3333-000000000001" />
@@ -9,10 +25,10 @@
     <Key Name="name" Value="Welcome" />
     <Key Name="assetType" Value="7" />
     <Key Name="inventoryType" Value="7" />
-    <Key Name="currentPermissions" Value="1000000000000000" />
-    <Key Name="nextPermissions" Value="1000000000000000" />
-    <Key Name="everyonePermissions" Value="1000000000000000" />
-    <Key Name="basePermissions" Value="1000000000000000" />
+    <Key Name="currentPermissions" Value="2147483647" />
+    <Key Name="nextPermissions" Value="2147483647" />
+    <Key Name="everyonePermissions" Value="2147483647" />
+    <Key Name="basePermissions" Value="2147483647" />
   </Section>
   <Section Name="4-tile2 Texture">
     <Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001000" />
diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml b/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml
new file mode 100644
index 0000000..2f37716
--- /dev/null
+++ b/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml
@@ -0,0 +1,18 @@
+<Nini>
+  <!-- The root library inventory folder is hardcoded as 00000112-000f-0000-0000-000100bba000 -->
+
+  <Section Name="Texture Library">
+    <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
+    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
+    <Key Name="name" Value="Texture Library"/>
+    <Key Name="type" Value="0"/>
+  </Section>
+<!--
+  <Section Name="Cheese Library">
+    <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba001"/>
+    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
+    <Key Name="name" Value="Cheese Library"/>
+    <Key Name="type" Value="13"/>
+  </Section>
+-->
+</Nini>
diff --git a/bin/inventory/README.txt b/bin/inventory/README.txt
index 003a18a..fdbbbdc 100644
--- a/bin/inventory/README.txt
+++ b/bin/inventory/README.txt
@@ -1,6 +1,14 @@
 README
 
-Inventory configuration is carried out here.  Currently, you can add new items to OpenSimLibrary/OpenSimLibrary.xml,
+The standard common inventory library is configured here.  You can add new inventory 
+folders to the standard library by editing OpenSimLibary/OpenSimLibraryFolders.xml
+You can also add new inventory items to OpenSimLibrary/OpenSimLibrary.xml,
 as long as they have a corresponding asset entry in bin/OpenSimAssetSet.xml.
 
+The same set of folders and items must be present in the configuration of both
+the grid servers and all the regions.  The reasons for this are historical - 
+this restriction will probably be lifted in the future, at which point the
+inventory items and folders will only need to be configured on the grid inventory
+server (assuming you are running in grid mode rather than standalone)
+
 Inventory_Default.xml and Inventory_Library.xml are unused at the moment.