summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorNicky <none@none>2012-07-07 22:10:43 +0200
committerNicky <none@none>2012-07-07 22:10:43 +0200
commitd1e924a71ef8ce41ba43bba1fbc1e1825401625c (patch)
treef23585f3b36c144c70cfc2808098c54d15fee83c /indra/newview/llappearancemgr.cpp
parente2fc91714c8526a623e5da0e3d590287bcfa0e54 (diff)
Crashfix: During cleanup gAgentAvatarp can already be 0.
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rwxr-xr-xindra/newview/llappearancemgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 6d67e098a6..06a9892c7e 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -52,7 +52,8 @@
std::string self_av_string()
{
- return gAgentAvatarp->avString();
+ // On logout gAgentAvatarp can already be invalid
+ return isAgentAvatarValid() ? gAgentAvatarp->avString() : "";
}
// RAII thingy to guarantee that a variable gets reset when the Setter