diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:06:24 +0100 |
| commit | daabe1fb133d69df938bb58d12f0be26bdc16ead (patch) | |
| tree | c5e66f6859593137c5d58c8b05667f97e0ca5dc9 /indra/newview/llviewerobjectlist.cpp | |
| parent | c22da3a2a9c4e2fa1e0b0b0c544f5933e91c6369 (diff) | |
| parent | 1596b01df60a00f9957885943ba7652dd4adce39 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 752aeaaab0..fc94fbafac 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -894,10 +894,10 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep) BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) { - // Don't ever kill gAgentAvatarp, just mark it as null region instead. + // Don't ever kill gAgentAvatarp, just force it to the agent's region if (objectp == gAgentAvatarp) { - objectp->setRegion(NULL); + objectp->setRegion(gAgent.getRegion()); return FALSE; } |