From 7c8bfac11ba35becd9a2f7fffaa568e1dade99ac Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Tue, 1 Nov 2011 17:20:12 -0700
Subject: Removed redundant SceneContents property from Scene. It's the same as
 SceneGraph property.

---
 OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                          | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index d1ce5df..b93a41b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.ClientStack.Linden
             ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
             TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
             CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS;
-            GetClient = m_Scene.SceneContents.GetControllingClient;
+            GetClient = m_Scene.SceneGraph.GetControllingClient;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 086de53..f012d72 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -470,11 +470,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_authenticateHandler; }
         }
 
-        public SceneGraph SceneContents
-        {
-            get { return m_sceneGraph; }
-        }
-
         public bool UseBackup
         {
             get { return m_useBackup; }
-- 
cgit v1.1


From b9e700b60d2782b9ccd5790c89920fcc912672ed Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 2 Nov 2011 11:43:16 +0000
Subject: Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure
 scenario

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 83c3b78..6c690e8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7411,12 +7411,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         TargetOmega(part, axis, (double)spinrate, (double)gain);
                         break;
                     case (int)ScriptBaseClass.PRIM_LINK_TARGET:
-                        if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                        if (remain < 1)
                             return;
                         LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
-                        LSL_List new_rules = rules.GetSublist(idx, -1);
-                        setLinkPrimParams((int)new_linknumber, new_rules);
-                            return;
+                        part = part.ParentGroup.GetLinkNumPart((int)new_linknumber);
+                        break;
                 }
             }
         }
-- 
cgit v1.1