diff options
author | Justin Clark-Casey (justincc) | 2014-01-27 23:17:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-27 23:17:09 +0000 |
commit | 1b86239f791754e2c3ba7bf2641db5882efb0c80 (patch) | |
tree | a2e0386380ce0311f8b579b6e5ddabc59f420f3f /OpenSim/Region/Framework/Scenes | |
parent | Re-enabled NPCModuleTests.TestCreate() (diff) | |
download | opensim-SC_OLD-1b86239f791754e2c3ba7bf2641db5882efb0c80.zip opensim-SC_OLD-1b86239f791754e2c3ba7bf2641db5882efb0c80.tar.gz opensim-SC_OLD-1b86239f791754e2c3ba7bf2641db5882efb0c80.tar.bz2 opensim-SC_OLD-1b86239f791754e2c3ba7bf2641db5882efb0c80.tar.xz |
refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occur no matter which branch of the conditional is executed
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 85a20e9..0cc00ed 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2909,7 +2909,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2909 | Rotation = newRot; | 2909 | Rotation = newRot; |
2910 | 2910 | ||
2911 | // ParentPosition = part.AbsolutePosition; | 2911 | // ParentPosition = part.AbsolutePosition; |
2912 | part.ParentGroup.AddAvatar(UUID); | ||
2913 | } | 2912 | } |
2914 | else | 2913 | else |
2915 | { | 2914 | { |
@@ -2918,13 +2917,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2918 | m_pos -= part.GroupPosition; | 2917 | m_pos -= part.GroupPosition; |
2919 | 2918 | ||
2920 | // ParentPosition = part.AbsolutePosition; | 2919 | // ParentPosition = part.AbsolutePosition; |
2921 | part.ParentGroup.AddAvatar(UUID); | ||
2922 | 2920 | ||
2923 | // m_log.DebugFormat( | 2921 | // m_log.DebugFormat( |
2924 | // "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", | 2922 | // "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", |
2925 | // Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); | 2923 | // Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); |
2926 | } | 2924 | } |
2927 | 2925 | ||
2926 | part.ParentGroup.AddAvatar(UUID); | ||
2928 | ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); | 2927 | ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); |
2929 | ParentID = m_requestedSitTargetID; | 2928 | ParentID = m_requestedSitTargetID; |
2930 | m_AngularVelocity = Vector3.Zero; | 2929 | m_AngularVelocity = Vector3.Zero; |