diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 18:37:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 18:37:53 +0100 |
| commit | 6ba23344c95157793af9e4154933ae8df61630e8 (patch) | |
| tree | e12956cbe7a0082bbaaa545cb80d9e86b13f88e8 /indra/newview/llimview.h | |
| parent | 01d06a3572c533f810f8f42e7ae9c55051f34aaf (diff) | |
| parent | 46e6135eef90b7ff0f08b12384a9aafc1a3e91e1 (diff) | |
merge heads. whew.
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index dfd39cc39c..4ce94773bf 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -227,7 +227,8 @@ public: * Get a session's name. * For a P2P chat - it's an avatar's name, * For a group chat - it's a group's name - * For an ad-hoc chat - is received from the server and is in a from of "<Avatar's name> conference" + * 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; |