diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
commit | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch) | |
tree | 1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/newview/llnearbychat.cpp | |
parent | b42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff) | |
parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) |
merge.
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
-rw-r--r-- | indra/newview/llnearbychat.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 85db69174d..029019a8dc 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -203,5 +203,12 @@ void LLNearbyChat::getAllowedRect(LLRect& rect) { rect = gViewerWindow->getWorldViewRectRaw(); } - +void LLNearbyChat::setMinimized (BOOL minimize) +{ + if(minimize && !isDocked()) + { + setVisible(FALSE); + } + LLDockableFloater::setMinimized(minimize); +} |