From 315097b8b962bb445f44d68e86c55b37e2d196cb Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Sun, 21 Jul 2013 13:36:03 -0700
Subject: [PATCH] Minor fixes

---
 .../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs   | 8 ++++++--
 OpenSim/Region/Framework/Scenes/Scene.cs                  | 4 ----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs          | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 58576d1056..991762d052 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -244,8 +244,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                             if (inventoryURL != null && inventoryURL != string.Empty)
                             {
                                 inventoryURL = inventoryURL.Trim(new char[] { '/' });
-                                m_InventoryURLs.Add(userID, inventoryURL);
-                                m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Added {0} to the cache of inventory URLs", inventoryURL);
+                                lock (m_InventoryURLs)
+                                    if (!m_InventoryURLs.ContainsKey(userID))
+                                    {
+                                        m_InventoryURLs.Add(userID, inventoryURL);
+                                        m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Added {0} to the cache of inventory URLs", inventoryURL);
+                                    }
                                 return;
                             }
                         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9cfe869098..947778e312 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4203,11 +4203,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (childAgentUpdate != null)
             {
                 if (cAgentData.SessionID != childAgentUpdate.ControllingClient.SessionId)
-                {
                     m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).", childAgentUpdate.UUID, cAgentData.SessionID);
-                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
-                        childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID));
-                }
 
                 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
                 return true;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5000d19781..a3d328fadb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3369,9 +3369,9 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Set callback for {0} in {1} to {2} in CopyFrom()",
 //                Name, m_scene.RegionInfo.RegionName, m_callbackURI);
+            
+            // Don't copy the agent position
 
-            //m_pos = cAgent.Position;
-            AbsolutePosition = cAgent.Position;
             m_velocity = cAgent.Velocity;
             CameraPosition = cAgent.Center;
             CameraAtAxis = cAgent.AtAxis;