diff options
author | Merov Linden <merov@lindenlab.com> | 2013-02-21 19:15:48 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-02-21 19:15:48 -0800 |
commit | 86150b4019d1a84b4af73f0ea18c47baff955562 (patch) | |
tree | e5414250c8b0c4f18e3a128d09b9da1494dadd75 /indra/newview/llfloaterimnearbychat.cpp | |
parent | f79f9f111b0db67cacfe9bbe453737f3979b3ba9 (diff) |
CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chat
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 430326203f..80051eb7f1 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -136,6 +136,27 @@ BOOL LLFloaterIMNearbyChat::postBuild() } // virtual +void LLFloaterIMNearbyChat::closeFloater(bool app_quitting) +{ + llinfos << "Merov debug : LLFloaterIMNearbyChat::closeFloater! " << llendl; + LLFloater::closeFloater(app_quitting); +} + +// virtual +void LLFloaterIMNearbyChat::closeHostedFloater() +{ + if (getHost()) + { + llinfos << "Merov debug : LLFloaterIMNearbyChat::closeHostedFloater : hosted -> do nothing" << llendl; + } + else + { + llinfos << "Merov debug : LLFloaterIMNearbyChat::closeHostedFloater : close floater " << llendl; + LLFloater::closeFloater(); + } +} + +// virtual void LLFloaterIMNearbyChat::refresh() { displaySpeakingIndicator(); |