aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-17 05:57:58 +0000
committerMelanie Thielker2008-11-17 05:57:58 +0000
commit598316c89051e8e8d6633520da63a7d44fd80bbd (patch)
treeb1607d4a381225788bcc9b997af60e0969657e8a /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentBack out the attachment location patch to debug a crash (diff)
downloadopensim-SC_OLD-598316c89051e8e8d6633520da63a7d44fd80bbd.zip
opensim-SC_OLD-598316c89051e8e8d6633520da63a7d44fd80bbd.tar.gz
opensim-SC_OLD-598316c89051e8e8d6633520da63a7d44fd80bbd.tar.bz2
opensim-SC_OLD-598316c89051e8e8d6633520da63a7d44fd80bbd.tar.xz
Make object chat come from the root prim's center, rather than trying to make
it come from a child prim position.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4148f9b..a02840c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -424,17 +424,14 @@ namespace OpenSim.Region.Environment.Scenes
424 m_groupPosition.Y = PhysActor.Position.Y; 424 m_groupPosition.Y = PhysActor.Position.Y;
425 m_groupPosition.Z = PhysActor.Position.Z; 425 m_groupPosition.Z = PhysActor.Position.Z;
426 } 426 }
427
427 if (IsAttachment) 428 if (IsAttachment)
428 { 429 {
429// if (m_parentGroup != null && m_parentGroup.RootPart != null) 430 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
430// { 431 if (sp != null)
431// ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_parentGroup.RootPart.AttachedAvatar); 432 {
432 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); 433 return sp.AbsolutePosition;
433 if (sp != null) 434 }
434 {
435 return sp.AbsolutePosition;
436 }
437// }
438 } 435 }
439 436
440 return m_groupPosition; 437 return m_groupPosition;