diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-08 10:55:48 -0700 |
| commit | 1c7b1532e994f8c4d1c69e419e34f07c1a9ee918 (patch) | |
| tree | ff5b60dbc6887a7a7420728a06804fa268720211 /indra/newview/llviewerobjectlist.cpp | |
| parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) | |
| parent | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (diff) | |
Merge from viewer-experience
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 db5684665b..153a91e7d8 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1254,7 +1254,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; @@ -1277,6 +1278,7 @@ BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) return TRUE; } + return FALSE; } |