diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-13 11:57:14 -0500 |
| commit | be210914f4e9081f021cc1ad3b671765aba79b61 (patch) | |
| tree | 006e4ec827b8c1b3cf6042c08e12aadf48f43943 /indra/newview/llappearancemgr.cpp | |
| parent | 7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (diff) | |
| parent | d8f081cf1b18ddb5f0412b21f4d36bfce6abae19 (diff) | |
merge changes for DRTVWR-238
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 6d67e098a6..06a9892c7e 100644 --- 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 |