diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-20 14:02:24 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-20 14:02:24 -0400 |
| commit | 80a33895dc715c86dbeef09f19819d981355d9bd (patch) | |
| tree | 0b3943de31941e37f6021f5c53dcc15d3fcc6ab4 /indra/newview/llimview.h | |
| parent | b4e0c28103fe30480650bbf39b48af2a8428c74b (diff) | |
| parent | 85f69fbd8620c98f67a39e9ac09c9946c87251d8 (diff) | |
Automated merge from viewer-development-shining
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 4ce94773bf..ba8c7ae489 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -230,7 +230,7 @@ public: * For an incoming ad-hoc chat - is received from the server and is in a from of "<Avatar's name> Conference" * It is updated in LLIMModel::LLIMSession's constructor to localize the "Conference". */ - const std::string& getName(const LLUUID& session_id) const; + const std::string getName(const LLUUID& session_id) const; /** * Get number of unread messages in a session with session_id |