diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-05 19:23:34 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-05 19:23:34 +0300 |
| commit | ff448aed525b8c1d2f05b6a5816ba6855707e4b8 (patch) | |
| tree | 1e9af09c37f5ecf44cc77ceddb4bb285ba025ea1 | |
| parent | 1fa326ccdbb9b99fedac0b4cdab232ec1fbe8d74 (diff) | |
CHUI-200 FIXED Show correct and localized name of the nearby chat In the conversations list
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 08ace601a3..134623722c 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -534,10 +534,6 @@ LLConversationItem::LLConversationItem(std::string name, const LLUUID& uuid, LLF mFloater(floaterp), mContainer(containerp) { - // Hack: the nearby chat has no name so we catch that case and impose one - // Of course, we won't be doing this in the final code - if (name == "") - mName = "Nearby Chat"; } // Virtual action callbacks diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 13e9eeee66..644304aff3 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -158,6 +158,10 @@ BOOL LLNearbyChat::postBuild() enableResizeCtrls(true, true, false); + // title must be defined BEFORE call addToHost() because + // it is used for show the item's name in the conversations list + setTitle(getString("NearbyChatTitle")); + addToHost(); //for menu @@ -182,7 +186,6 @@ BOOL LLNearbyChat::postBuild() loadHistory(); } - setTitle(getString("NearbyChatTitle")); return LLIMConversation::postBuild(); } |