diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-18 18:30:00 -0500 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-11-18 18:30:00 -0500 |
| commit | 3eb3198248395922a1dfe277399e1a3cd235f952 (patch) | |
| tree | 92e1a7f65683a0aec2589ba64c756e6493d47611 | |
| parent | 327a922dc9cda771077826ecf7521464ebd281c0 (diff) | |
STORM-654 : Person to Person chat logs are not created if Display Names are off
Modified code in indicated changeset to correct problem after consulting with
Leyla Linden who sugested the orginal change. This fix will convert the Legacy
name to a user name id not useing Display Names.
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index eabbbe87b5..b255ca98cd 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -769,6 +769,7 @@ WolfPup Lowenhar STORM-143 STORM-535 STORM-544 + STORM-654 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index cc48226052..3578c98622 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -537,7 +537,15 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) { - mHistoryFileName = av_name.mUsername; + if (av_name.mUsername.empty()) + { + // display names is off, use mDisplayName which will be the legacy name + mHistoryFileName = LLCacheName::buildUsername(av_name.mDisplayName); + } + else + { + mHistoryFileName = av_name.mUsername; + } } void LLIMModel::LLIMSession::buildHistoryFileName() |