OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some null checks

0.6.1-post-fixes
Melanie Thielker 2008-11-17 00:45:56 +00:00
parent 74ba1bb180
commit 0e7b6879d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -424,7 +424,7 @@ namespace OpenSim.Region.Environment.Scenes
m_groupPosition.Y = PhysActor.Position.Y; m_groupPosition.Y = PhysActor.Position.Y;
m_groupPosition.Z = PhysActor.Position.Z; m_groupPosition.Z = PhysActor.Position.Z;
} }
if (ParentGroup.RootPart.IsAttachment) if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart.IsAttachment)
{ {
ScenePresence sp = m_parentGroup.Scene.GetScenePresence(ParentGroup.RootPart.AttachedAvatar); ScenePresence sp = m_parentGroup.Scene.GetScenePresence(ParentGroup.RootPart.AttachedAvatar);
if (sp != null) if (sp != null)
@ -743,7 +743,7 @@ if (m_shape != null) {
public Vector3 AbsolutePosition public Vector3 AbsolutePosition
{ {
get { get {
if (ParentGroup.RootPart.IsAttachment) if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart.IsAttachment)
return GroupPosition; return GroupPosition;
return m_offsetPosition + m_groupPosition; } return m_offsetPosition + m_groupPosition; }