summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-11-29 11:06:10 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-11-29 11:06:10 -0500
commit47a2a2982de98c88fbc6cd17bdb897e5ec408b88 (patch)
tree1bea303bec726027db54e11af8ec8a653a350471
parentbf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff)
fix for possible crash on exit in self_av_string()
-rwxr-xr-xindra/newview/llappearancemgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4e103bb75e..9f6586a69b 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -52,7 +52,7 @@
std::string self_av_string()
{
- return gAgentAvatarp->avString();
+ return gAgentAvatarp ? gAgentAvatarp->avString() : std::string("self_av_string error, gAgentAvatarp null");
}
// RAII thingy to guarantee that a variable gets reset when the Setter