Make it possible for new inventory 'libraries' to be added without changing the default OpenSimLibrary files. Additional library folders and items can be added in a separate

directory 
and linked in by an entry to inventory/Libraries.xml

3 files changed, 42 insertions, 13 deletions

diff --git a/bin/assets/AssetSets.xml b/bin/assets/AssetSets.xml
index b827e59..c94cd59 100644
--- a/bin/assets/AssetSets.xml
+++ b/bin/assets/AssetSets.xml
@@ -1,13 +1,18 @@
 <Nini>
   <!-- You probably don't want to remove the OpenSim asset set
-       since it contains various default assets which are currently hardcoded -->
+       since it contains various default assets which are currently hardcoded 
+       However, you can remove the corresponding inventory library in bin/inventory if you wish
+  -->
+
   <Section Name="OpenSim Asset Set">
     <Key Name="file" Value="OpenSimAssetSet/OpenSimAssetSet.xml"/>
   </Section>
+
   <!-- New asset sets can be added as shown below -->
-  <!--
+
+<!--
   <Section Name="My Asset Set">
     <Key Name="file" Value="MyAssetSet/MyAssetSet.xml"/>
   </Section>
-  -->
+-->
 </Nini>
diff --git a/bin/inventory/Libraries.xml b/bin/inventory/Libraries.xml
new file mode 100644
index 0000000..09270b5
--- /dev/null
+++ b/bin/inventory/Libraries.xml
@@ -0,0 +1,17 @@
+<Nini>
+  <Section Name="OpenSim Standard Library">
+    <Key Name="foldersFile" Value="OpenSimLibrary/OpenSimLibraryFolders.xml"/>
+    <Key Name="itemsFile" Value="OpenSimLibrary/OpenSimLibrary.xml"/>
+  </Section>
+  <!-- Additional libraries can be added as shown below.  These folders and items can appear underneath
+       the hardcoded root library folder ("OpenSim Library") 
+
+       You can also add folders and items to the folders of libraries defined earlier on in this file -->
+
+<!--
+  <Section Name="My Site Library">
+    <Key Name="foldersFile" Value="MySiteLibrary/MySiteLibraryFolders.xml"/>
+    <Key Name="itemsFile" Value="MySiteLibrary/MySiteLibraryItems.xml"/>
+  </Section>
+-->
+</Nini>
diff --git a/bin/inventory/README.txt b/bin/inventory/README.txt
index f32f1aa..ecd81d1 100644
--- a/bin/inventory/README.txt
+++ b/bin/inventory/README.txt
@@ -1,14 +1,21 @@
 README
 
-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)
+Folders and items which will appear in the standard common library for all
+avatars can be configured here.  The root folder (currently called OpenSim
+Library) is hardcoded, but you can add your own configuration of folders and
+items directly beneath this, in addition to (or instead of) the contents of the 
+default OpenSim library.
+
+To add a new library, edit Libraries.xml.  The entry in here needs to point to
+two further xml files, one which details your library inventory folders and another
+which details your library inventory items.  Each inventory item will need to be
+associated with an asset.  Assets are configured separately in the bin/assets
+directory.
+
+If you are running in grid mode, any library you add must be present in both 
+your grid servers installation and in
+every region installation, otherwise library items will fail in the regions
+where the inventory configuration is not present.  The reasons for this are historical
+and will probably be lifted in a future revision.
 
 Files in the attic directory are currently unused.