From a69cb5e3901eb9aa7ebfa65a5787e023136a2b19 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 3 May 2010 21:34:38 +0100
Subject: Address symptom of Mantis 4588 (though not the cause) by moving the
 avatar dereference inside the exception catch

---
 OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 1a6cd6c..4bcfaac 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -146,10 +146,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
         }
 
         private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
-        {
-            ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+        {            
             try
             {
+                ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                
                 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
                 {
                     avatar.Invulnerable = false;
-- 
cgit v1.1


From 547e0278990208e52a35ac92add22f756d8674f2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 30 Apr 2010 22:35:07 +0200
Subject: Fix linking issue introduced in my earlier commit

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8716e0a..4f2b446 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2594,8 +2594,17 @@ namespace OpenSim.Region.Framework.Scenes
             List<SceneObjectPart> children = new List<SceneObjectPart>();
             SceneObjectPart root = GetSceneObjectPart(parentPrimId);
 
-            if (Permissions.CanLinkObject(client.AgentId, root.ParentGroup.RootPart.UUID))
+            if (root == null)
+            {
+                m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId);
+                return;
+            }
+
+            if (!Permissions.CanLinkObject(client.AgentId, root.ParentGroup.RootPart.UUID))
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. No permissions on root prim");
                 return;
+            }
 
             foreach (uint localID in childPrimIds)
             {
@@ -2614,7 +2623,16 @@ namespace OpenSim.Region.Framework.Scenes
             // Must be all one owner
             //
             if (owners.Count > 1)
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. Too many owners");
+                return;
+            }
+
+            if (children.Count == 0)
+            {
+                m_log.DebugFormat("[LINK]: Refusing link. No permissions to link any of the children");
                 return;
+            }
 
             m_sceneGraph.LinkObjects(root, children);
         }
-- 
cgit v1.1


From 2f6bb013701b45421b906625560d8b417ad78689 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey
Date: Fri, 14 May 2010 21:22:53 +0100
Subject: Apply patch from
 http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 Fixes a bug
 where the viewer didn't recieve the uuid of a chat broadcasting object Thanks
 crystalsgalicia!

---
 OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6dacbba..02f0968 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -264,6 +264,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromName = avatar.Name;
                 sourceType = ChatSourceType.Agent;
             }
+            else if (c.SenderUUID != UUID.Zero) 
+            {
+                fromID = c.SenderUUID; 
+            }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
 
-- 
cgit v1.1