diff options
| author | Melanie Thielker | 2008-11-17 05:47:36 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-17 05:47:36 +0000 |
| commit | 2a8020b9d9e77445ebbb91128d53eb9a32db64b6 (patch) | |
| tree | aaa88cdf4cf5cf0edb23b7cf2a496dafb1ae0945 /OpenSim/Region/Environment | |
| parent | Try to fix login crash (diff) | |
| download | opensim-SC_OLD-2a8020b9d9e77445ebbb91128d53eb9a32db64b6.zip opensim-SC_OLD-2a8020b9d9e77445ebbb91128d53eb9a32db64b6.tar.gz opensim-SC_OLD-2a8020b9d9e77445ebbb91128d53eb9a32db64b6.tar.bz2 opensim-SC_OLD-2a8020b9d9e77445ebbb91128d53eb9a32db64b6.tar.xz | |
Back out the attachment location patch to debug a crash
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index a7eb0b7..4148f9b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -426,14 +426,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 426 | } | 426 | } |
| 427 | if (IsAttachment) | 427 | if (IsAttachment) |
| 428 | { | 428 | { |
| 429 | if (m_parentGroup != null && m_parentGroup.RootPart != null) | 429 | // if (m_parentGroup != null && m_parentGroup.RootPart != null) |
| 430 | { | 430 | // { |
| 431 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_parentGroup.RootPart.AttachedAvatar); | 431 | // ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_parentGroup.RootPart.AttachedAvatar); |
| 432 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); | ||
| 432 | if (sp != null) | 433 | if (sp != null) |
| 433 | { | 434 | { |
| 434 | return sp.AbsolutePosition; | 435 | return sp.AbsolutePosition; |
| 435 | } | 436 | } |
| 436 | } | 437 | // } |
| 437 | } | 438 | } |
| 438 | 439 | ||
| 439 | return m_groupPosition; | 440 | return m_groupPosition; |