Merge branch 'avination' into ubitwork

3 files changed, 22 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d46adb8..0a865ab 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6601,8 +6601,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
                 if (handlerAgentRequestSit != null)
-                    handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
-                                           agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
+                    if (!(agentRequestSit.AgentData == null
+                        || agentRequestSit.TargetObject == null
+                        || agentRequestSit.TargetObject.TargetID == null
+                        || agentRequestSit.TargetObject.Offset == null))
+                    {
+                        var sp = m_scene.GetScenePresence(agentRequestSit.AgentData.AgentID);
+                        if (sp == null || sp.ParentID != 0) // ignore packet if agent is already sitting
+                            return true;
+
+                        handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
+                                               agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
+                    }
             }
             return true;
         }
diff --git a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
index 64bf72c..d56d188 100644
--- a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
@@ -31,6 +31,6 @@ namespace OpenSim.Framework
 {
     public interface ISearchModule
     {
-
+        void Refresh();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1e1e574..525e575 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2260,7 +2260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return end;
         }
 
-        protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos)
+        protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos, bool adjust)
         {
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return fromPos;
@@ -2276,9 +2276,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
                     targetPos.z = ground;
             }
-            LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos);
+            if (adjust)
+                return SetPosAdjust(fromPos, targetPos);
 
-            return real_vec;
+            return targetPos;
         }
 
         /// <summary>
@@ -2293,7 +2294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
 
             LSL_Vector currentPos = GetPartLocalPos(part);
-            LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos);
+            LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos, adjust);
 
 
             if (part.ParentGroup.RootPart == part)
@@ -7925,7 +7926,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 return null;
 
                             v=rules.GetVector3Item(idx++);
-                            currentPosition = GetSetPosTarget(part, v, currentPosition);
+                            if (part.IsRoot && !part.ParentGroup.IsAttachment)
+                                currentPosition = GetSetPosTarget(part, v, currentPosition, true);
+                            else
+                                currentPosition = GetSetPosTarget(part, v, currentPosition, false);
                             positionChanged = true;
 
                             break;