diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-14 14:54:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-14 14:54:20 -0400 |
| commit | 4b269f67ea8d053b4c05a9c002811901c8ec8a49 (patch) | |
| tree | 401f44f1c339fc8fa847c355129d91cacd2bd22a /indra/newview/llviewerobjectlist.cpp | |
| parent | df40eca093b1a238daea9cd23c44f6e39719bf51 (diff) | |
| parent | b2d20f5a989bde2c4db90091bec37d310cc346fc (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index ce88c8759f..6912faa9ec 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1258,7 +1258,8 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep) BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) { // Don't ever kill gAgentAvatarp, just force it to the agent's region - if (objectp == gAgentAvatarp) + // unless region is NULL which is assumed to mean you are logging out. + if ((objectp == gAgentAvatarp) && gAgent.getRegion()) { objectp->setRegion(gAgent.getRegion()); return FALSE; @@ -1281,6 +1282,7 @@ BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) return TRUE; } + return FALSE; } |