diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
| commit | be666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (patch) | |
| tree | 282683cfddf5c624a72cd3f21cd66f18818cba77 /indra/newview/llnearbychat.cpp | |
| parent | 211529eee9a4cbb36961af75e94af73da920d08d (diff) | |
| parent | aba8b04cfc6763ee565a5ae9929e8be044272b08 (diff) | |
merge from product-engine
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); +} |