diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-29 20:43:32 -0700 |
| commit | a7a24dc2f9450e0d51e7110a7eb44e0f27a010db (patch) | |
| tree | 296b5344b33734babfde6aeecb36af2e005ddc32 /indra/newview/llnearbychat.cpp | |
| parent | 480c3a1acb32e98d0d64aaf7bb70e4d61e6882f6 (diff) | |
| parent | 1a1a0b91c0c4400ec3febac183124314f9226127 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index a89ae4a2dc..5b274dd389 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -287,10 +287,10 @@ void LLNearbyChat::setVisible(BOOL visible) { LLIMConversation::setVisible(visible); - if(visible) - { - removeScreenChat(); - } + if(visible) + { + removeScreenChat(); + } setFocus(visible); } @@ -327,7 +327,7 @@ void LLNearbyChat::addToHost() mIsHostSet = true; } -} + } bool LLNearbyChat::isHostSet() { @@ -722,7 +722,7 @@ void LLNearbyChat::sendChatFromViewer(const LLWString &wtext, EChatType type, BO send_chat_from_viewer(utf8_out_text, type, channel); } -// static +// static bool LLNearbyChat::isWordsName(const std::string& name) { // checking to see if it's display name plus username in parentheses |