diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-21 10:36:29 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-21 10:36:29 -0500 |
| commit | 38f4bad925214d848eccd2b5e32123afeb68984d (patch) | |
| tree | a1a21acac904ebfc5e80db226ab587af2d6558f7 /indra/newview/llimview.cpp | |
| parent | eac9c45cdad9c96e621f5c84ce51062f40c09511 (diff) | |
| parent | bb3be2c07f492577254ae9ace5675eb92d10f061 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index afd565bb26..9623554200 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -279,7 +279,7 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& void LLIMModel::LLIMSession::onAdHocNameCache(const LLAvatarName& av_name) { - if (av_name.mIsDummy) + if (av_name.mIsTemporaryName) { S32 separator_index = mName.rfind(" "); std::string name = mName.substr(0, separator_index); |