From 4e9f50b878ae9d09e976ea7bc81f230ce9637cf4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Dec 2011 22:32:28 +0000
Subject: Add commented log lines to FetchInventoryDescendents2 path for future
 use.

Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2349e40..280fdc7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -113,6 +113,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return;
             }
 
+//            m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name);
+
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
-- 
cgit v1.1


From 94c242f79262fce6a898478c24edee78d70780d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Dec 2011 22:36:51 +0000
Subject: Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset
 so that it doesn't trigger an exception if the item hasn't been found.

In this situation we will now put out a slightly more meaningful log error message instead.
---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 26eb729..b62023b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -337,11 +337,12 @@ namespace OpenSim.Region.Framework.Scenes
             // Passing something to another avatar or a an object will already
             InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
             item = InventoryService.GetItem(item);
-            if (item.Owner != remoteClient.AgentId)
-                return;
 
             if (item != null)
             {
+                if (item.Owner != remoteClient.AgentId)
+                    return;
+
                 if (UUID.Zero == transactionID)
                 {
                     item.Name = itemUpd.Name;
@@ -388,8 +389,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                m_log.Error(
-                    "[AGENTINVENTORY]: Item ID " + itemID + " not found for an inventory item update.");
+                m_log.ErrorFormat(
+                    "[AGENTINVENTORY]: Item id {0} not found for an inventory item update for {1}.",
+                    itemID, remoteClient.Name);
             }
         }
 
-- 
cgit v1.1


From cb0da425d5d904920939184e725a60708e6c5842 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Dec 2011 22:41:39 +0000
Subject: Fix "fix-phantoms" help message.  Thanks Garmin Kawaguichi.

---
 OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 3f9834c..9b468dd 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -67,11 +67,12 @@ namespace OpenSim.Region.RegionCombinerModule
         {
             IConfig myConfig = source.Configs["Startup"];
             enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false);
-            //enabledYN = true;
+
             if (enabledYN)
-                MainConsole.Instance.Commands.AddCommand("RegionCombinerModule", false, "fix-phantoms",
-                    "Fix phantom objects", "Fixes phantom objects after an import to megaregions", FixPhantoms);
-            }
+                MainConsole.Instance.Commands.AddCommand(
+                    "RegionCombinerModule", false, "fix-phantoms", "fix-phantoms",
+                    "Fixes phantom objects after an import to megaregions", FixPhantoms);
+        }
 
         public void Close()
         {
-- 
cgit v1.1


From fc27806e9058912d773ecf51fc4afaeb5ff5d7cf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Dec 2011 22:52:54 +0000
Subject: remove some unused fields in ScenePresence

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8824921..cebf51b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -181,10 +181,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private const int LAND_VELOCITYMAG_MAX = 12;
 
-        public bool IsRestrictedToRegion;
-
-        public string JID = String.Empty;
-
         private float m_health = 100f;
 
         protected ulong crossingFromRegion;
-- 
cgit v1.1