aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-12-14 12:07:35 +0000
committerMelanie2010-12-14 12:07:35 +0000
commite47cc10674c2019bbe9b71ce30040ce6049df017 (patch)
tree56d71177c6dc91210ddaa2fea8057d104adb9408
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-e47cc10674c2019bbe9b71ce30040ce6049df017.zip
opensim-SC_OLD-e47cc10674c2019bbe9b71ce30040ce6049df017.tar.gz
opensim-SC_OLD-e47cc10674c2019bbe9b71ce30040ce6049df017.tar.bz2
opensim-SC_OLD-e47cc10674c2019bbe9b71ce30040ce6049df017.tar.xz
Null checking ParentGroup is not needed. It can't be null.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 221f3bc..62d7011 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1704,8 +1704,7 @@ namespace OpenSim.Region.Framework.Scenes
1704 // Reset sit target. 1704 // Reset sit target.
1705 if (part.GetAvatarOnSitTarget() == UUID) 1705 if (part.GetAvatarOnSitTarget() == UUID)
1706 part.SitTargetAvatar = UUID.Zero; 1706 part.SitTargetAvatar = UUID.Zero;
1707 if (part.ParentGroup != null) 1707 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1708 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1709 1708
1710 m_parentPosition = part.GetWorldPosition(); 1709 m_parentPosition = part.GetWorldPosition();
1711 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1710 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
@@ -1814,8 +1813,7 @@ namespace OpenSim.Region.Framework.Scenes
1814 sitOrientation = avSitOrientation; 1813 sitOrientation = avSitOrientation;
1815 autopilot = false; 1814 autopilot = false;
1816 } 1815 }
1817 if (part.ParentGroup != null) 1816 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1818 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1819 1817
1820 pos = part.AbsolutePosition + offset; 1818 pos = part.AbsolutePosition + offset;
1821 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) 1819 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1)