diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-08 17:15:44 -0800 |
| commit | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (patch) | |
| tree | 3bdc286929e7a2b913232f0a21137655b399bad5 /indra/newview/llimfloatercontainer.cpp | |
| parent | 1d590cd5fdecabbbf6e96be37a2673de347e2224 (diff) | |
| parent | 5aa5a77af66425dd90599b0b0cad5b8f58d7669a (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 6fc03cec66..9c1f5d7593 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -1547,4 +1547,11 @@ void LLIMFloaterContainer::openNearbyChat() } } +void LLIMFloaterContainer::onNearbyChatClosed() +{ + // If nearby chat is the only remaining conversation and it is closed, close whole conversation floater as well + if (mConversationsItems.size() == 1) + closeFloater(); +} + // EOF |