diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:18 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:20:18 -0500 |
| commit | 5f997751fe4e55ad3c8a62bcfcdd91752f613903 (patch) | |
| tree | b40caf3240af0fb9f071022c6c17eb66e9a239a3 /indra/newview/llimview.cpp | |
| parent | 7461f1ca2be2851b76ded50d2eb9c0fcc46cfd5f (diff) | |
| parent | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (diff) | |
merge changes for storm-383
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); |