From d34a46eae193d961bd48562bc28747fc010db119 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 27 Jun 2008 14:39:21 +0000
Subject: * refactor: Move responsibility for deciding whether a group should
be repersisted on to callers of SceneObjectGroup.SendGroupTeruseUpdate()
---
OpenSim/Region/Environment/Scenes/InnerScene.cs | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 5256c9e..6dccf77 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1082,6 +1082,12 @@ namespace OpenSim.Region.Environment.Scenes
}
}
+ ///
+ /// Update the position of the given part
+ ///
+ ///
+ ///
+ ///
protected internal void UpdatePrimSinglePosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
{
SceneObjectGroup group = GetGroupByPrim(localID);
@@ -1093,6 +1099,7 @@ namespace OpenSim.Region.Environment.Scenes
group.SendGroupTerseUpdate();
return;
}
+
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment)
{
group.UpdateSinglePosition(pos, localID);
@@ -1101,7 +1108,7 @@ namespace OpenSim.Region.Environment.Scenes
}
///
- ///
+ /// Update the position of the given part
///
///
///
@@ -1122,6 +1129,7 @@ namespace OpenSim.Region.Environment.Scenes
if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
{
group.SendGroupTerseUpdate();
+
return;
}
if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment)
@@ -1168,6 +1176,13 @@ namespace OpenSim.Region.Environment.Scenes
}
}
+ ///
+ /// Move the given object
+ ///
+ ///
+ ///
+ ///
+ ///
protected internal void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)
{
SceneObjectGroup group = GetGroupByPrim(objectID);
--
cgit v1.1