diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-25 13:02:16 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-25 13:02:16 -0400 |
| commit | bd068caa4ca6f0a80d3e206bca1d7c88d18836a5 (patch) | |
| tree | 9a8c806d4579fa411079c5c062887e3d4f81af87 /indra/newview/llviewerobjectlist.cpp | |
| parent | 3ae35441b9a4728a8e9ade3d02fceb1fd2cc0027 (diff) | |
| parent | abb607a65e8a3f9328a0ce97fa5d3d08a75338ef (diff) | |
merge from dessie/viewer_release
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; } |