diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
index 8e2c6b57a8..7a0915d040 100755
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
@@ -393,7 +393,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 else
                     caps.RegisterPollHandler("ViewerAsset", new PollServiceAssetEventArgs(capUrl, agentID, m_scene, hgassets));
             }
-            else if (string.IsNullOrEmpty(m_GetAssetURL))
+            else if (!string.IsNullOrEmpty(m_GetAssetURL))
                 caps.RegisterHandler("ViewerAsset", m_GetAssetURL);
         }
     }
diff --git a/bin/inventory/Libraries.xml b/bin/inventory/Libraries.xml
index 8eed454987..818565e0ca 100644
--- a/bin/inventory/Libraries.xml
+++ b/bin/inventory/Libraries.xml
@@ -1,8 +1,6 @@
 <Nini>
   <Section Name="OpenSim Standard Library">
-    <Key Name="foldersFile" Value="OpenSimLibrary/OpenSimLibraryFolders.xml"/>
-    <Key Name="itemsFile" Value="OpenSimLibrary/OpenSimLibrary.xml"/>
-    <Key Name = "RootVersion" Value="427"/>
+    <Key Name = "RootVersion" Value="428"/>
   </Section>
   
 <!-- Additional libraries can be added as shown below.  These folders and items can appear underneath
diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
deleted file mode 100644
index bef59d8add..0000000000
--- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Nini>
-  <!-- the root Opensim Library folder ID is 00000112-000f-0000-0000-000100bba000 -->
-
-<!--
-  <Section Name="Example Library Item">
-    <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-000100bba003"/>
-    <Key Name="description" Value="Example Library Item" />
-    <Key Name="name" Value="Example Library Item" />
-    <Key Name="assetType" Value="7" />
-    <Key Name="inventoryType" Value="7" />
-  </Section>
---> 
-
-</Nini>
diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml b/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml
deleted file mode 100644
index 41fce01cdd..0000000000
--- a/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Nini>
-  <!-- The root library inventory folder is hardcoded as 00000112-000f-0000-0000-000100bba000 -->
-  <!-- Refer to the other folders under inventory, prefference is not to add entries here -->
-
-<!--
-  <Section Name="Example Library">
-    <Key Name="folderID" Value="12345678-1234-1234-1234-1234567890ab"/>
-    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
-    <Key Name="name" Value="Example Library"/>
-    <Key Name="type" Value="0"/>
-  </Section>
-  -->
-  
-</Nini>
diff --git a/bin/inventory/SettingsLibrary/Folders.xml b/bin/inventory/SettingsLibrary/Folders.xml
index 9997e6ea64..f1665561b4 100644
--- a/bin/inventory/SettingsLibrary/Folders.xml
+++ b/bin/inventory/SettingsLibrary/Folders.xml
@@ -4,29 +4,34 @@
     <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
     <Key Name="name" Value="Settings Library"/>
     <Key Name="type" Value="-1"/>
+    <Key Name="version" Value="2"/>
   </Section>
   <Section Name="Water">
     <Key Name="folderID" Value="25000112-000f-0000-0000-000100bba025"/>
     <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
     <Key Name="name" Value="Water"/>
     <Key Name="type" Value="-1"/>
+    <Key Name="version" Value="2"/>
   </Section>
   <Section Name="Skies">
     <Key Name="folderID" Value="25100112-000f-0000-0000-000100bba025"/>
     <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
     <Key Name="name" Value="Skies"/>
     <Key Name="type" Value="-1"/>
+    <Key Name="version" Value="2"/>
   </Section>
   <Section Name="Days">
     <Key Name="folderID" Value="25200112-000f-0000-0000-000100bba025"/>
     <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
     <Key Name="name" Value="Days"/>
     <Key Name="type" Value="-1"/>
+    <Key Name="version" Value="2"/>
   </Section>
   <Section Name="Textures">
     <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
     <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
     <Key Name="name" Value="Textures"/>
     <Key Name="type" Value="-1"/>
+    <Key Name="version" Value="2"/>
   </Section>
 </Nini>