diff options
author | Merov Linden <merov@lindenlab.com> | 2013-04-04 12:17:07 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-04-04 12:17:07 -0700 |
commit | 48d98b493038240b639775a93b33e4f9357e408f (patch) | |
tree | d44fd428e6e67536077980907b3f9743bd9ccc00 /indra/newview/llfloaterimnearbychat.cpp | |
parent | e09959df0d51eb8f4d37719d2753d2016390b25b (diff) | |
parent | dabce05d1eed47944e39438e50b3c788b7df649d (diff) |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 56b0c15cb9..49f36a2f32 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -328,7 +328,7 @@ void LLFloaterIMNearbyChat::onChatFontChange(LLFontGL* fontp) void LLFloaterIMNearbyChat::show() { openFloater(getKey()); - } +} bool LLFloaterIMNearbyChat::isChatVisible() const { |