Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs

@@ -96,15 +96,19 @@ namespace OpenSim.Framework.Serialization.Tests
         [Test]
         public void LandDataSerializerSerializeTest()
         {
-            string serialized = LandDataSerializer.Serialize(this.land);
+            string serialized = LandDataSerializer.Serialize(this.land).Replace("\r\n", "\n");
             Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
-            Assert.That(serialized == LandDataSerializerTest.preSerialized, 
-                        "result of Serialize(LandData) does not match expected result");
 
-            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList);
+            // adding a simple boolean variable because resharper nUnit integration doesn't like this
-            Assert.That(serializedWithParcelAccessList.Length > 0, 
+            // XML data in the Assert.That statement.   Not sure why.
+            bool result = (serialized == preSerialized);
+            Assert.That(result, "result of Serialize LandData  does not match expected result");
+
+            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList).Replace("\r\n", "\n");
+            Assert.That(serializedWithParcelAccessList.Length > 0,
                         "Serialize(LandData) returned empty string for LandData object with ParcelAccessList");
-            Assert.That(serializedWithParcelAccessList == LandDataSerializerTest.preSerializedWithParcelAccessList, 
+            result = (serializedWithParcelAccessList == preSerializedWithParcelAccessList);
+            Assert.That(result,
                         "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
         }
 

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1154,6 +1154,21 @@ namespace OpenSim.Region.Framework.Scenes
             if (folder == null)
                 return;
 
+            // TODO: This code for looking in the folder for the library should be folded somewhere else
+            // so that this class doesn't have to know the details (and so that multiple libraries, etc.
+            // can be handled transparently).
+            InventoryFolderImpl fold = null;
+            if (LibraryService != null && LibraryService.LibraryRootFolder != null)
+            {
+                if ((fold = LibraryService.LibraryRootFolder.FindFolder(folder.ID)) != null)
+                {
+                    client.SendInventoryFolderDetails(
+                        fold.Owner, folder.ID, fold.RequestListOfItems(),
+                        fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems);
+                    return;
+                }
+            }
+
             // Fetch the folder contents
             InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID);
 
@@ -1164,7 +1179,7 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
             //    contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
 
-            if (containingFolder != null)
+            if (containingFolder != null && containingFolder != null)
                 client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
         }
 

OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs

@@ -513,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             // FIXME MAYBE: We're not handling sortOrder!
 
-            // TODO: This code for looking in the folder for the library should be folded back into the
+            // TODO: This code for looking in the folder for the library should be folded somewhere else
-            // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
+            // so that this class doesn't have to know the details (and so that multiple libraries, etc.
             // can be handled transparently).
             InventoryFolderImpl fold = null;
             if (LibraryService != null && LibraryService.LibraryRootFolder != null)

bin/Robust.HG.ini.example

@@ -125,6 +125,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
+    AllowRemoteSetLoginLevel = "false"
+    
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
     ; CHANGE THIS
     HomeURI = "http://127.0.0.1:8002"

bin/Robust.ini.example

@@ -126,7 +126,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
     WelcomeMessage = "Welcome, Avatar!"
-    AllowRemoteSetLoginLevel = "false";
+    AllowRemoteSetLoginLevel = "false"
 
 
 [GridInfoService]

bin/config-include/GridHypergrid.ini

@@ -40,5 +40,10 @@
 
 	AllowHypergridMapSearch = true
 
+[LibraryService]
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"