diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
| commit | bca2b9a053b1358435b57e0c7a59866702644844 (patch) | |
| tree | 017eff9fe68352e4dca6db8837b513b78dfa7f47 /indra/newview/llimview.cpp | |
| parent | ad555098bf599bbb9bdb4db945baef56674c0f2d (diff) | |
| parent | a426a4b65b4914c2469a0db1dbde4051b59c289b (diff) | |
merge changes for storm-832
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); |