diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 12:46:37 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 12:46:37 -0700 |
| commit | c64bd7d5cb28fc221716e866ff9c9a28c22e69ce (patch) | |
| tree | 134c02f5eb0bb4bc03a19b2d88de29032d6460c4 | |
| parent | 6bb2b2cb99740a00498f5441b8a48b0bf5a04985 (diff) | |
Reduced text spam on exit by not trying to set all objects to a NULL region.
Reviewed by Richard.
| -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; } |