From 47a2a2982de98c88fbc6cd17bdb897e5ec408b88 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 29 Nov 2012 11:06:10 -0500
Subject: fix for possible crash on exit in self_av_string()

---
 indra/newview/llappearancemgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

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
-- 
cgit v1.2.3