From 2b48ed60ecf45e4ec07af1cadbb6325c3e678a13 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 6 May 2010 02:02:12 +0200
Subject: Remove the m_Viewer variable and make the property a shortcut to the
 proper field in AgentCircuitData instead

---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 3 ---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fff024f..1a46837 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2651,10 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 ScenePresence sp = CreateAndAddScenePresence(client);
                 if (aCircuit != null)
-                {
                     sp.Appearance = aCircuit.Appearance;
-                    sp.Viewer = aCircuit.Viewer;
-                }
 
                 // HERE!!! Do the initial attachments right here
                 // first agent upon login is a root agent by design.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fb66fcd..30eafd7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -218,8 +218,6 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_followCamAuto;
 
         private int m_movementUpdateCount;
-        private string m_Viewer = String.Empty;
-
         private const int NumMovementsBetweenRayCast = 5;
 
         private bool CameraConstraintActive;
@@ -654,8 +652,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string Viewer
         {
-            get { return m_Viewer; }
-            set { m_Viewer = value; }
+            get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
         }
 
         #endregion
-- 
cgit v1.1


From 53594e599e7f10bed441007f29a08d23e41e9188 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 5 May 2010 21:12:13 -0700
Subject: * Fixes Library bugs in grid mode. Partly a missing check and partly
 a missing configuration. * Made previous Robust config changes consistent in
 Robust.HG.ini.example

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs      | 17 ++++++++++++++++-
 OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 20760b2..60f730d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/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);
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index bc10230..e25b1f1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/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
-            // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
+            // 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)
-- 
cgit v1.1