diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
| commit | 623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch) | |
| tree | 21c815db542e45fc07473cd26a24561c5f27add8 /indra/newview/llappearancemgr.cpp | |
| parent | d56a98dea4c7523a759bea4740d8bdde1df15e30 (diff) | |
| parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) | |
merge release tag
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r--[-rwxr-xr-x] | 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 100755..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 |