diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
| commit | 70aaa3e444cf9cb067addcbdde237762bd62fcf4 (patch) | |
| tree | 4013659d2335c4681b8c93ea795cf8ccb8aa55cd /indra/llui/llfloater.cpp | |
| parent | 08d746156b56d8b72919af8cbca25609c855ef82 (diff) | |
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 40c11c69cc..3da53275c7 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1919,7 +1919,11 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) LLFloater* floaterp = (LLFloater*)(*view_it); sendChildToFront(floaterp); - floaterp->setMinimized(FALSE); + // always unminimize dependee, but allow dependents to stay minimized + if (!floaterp->isDependent()) + { + floaterp->setMinimized(FALSE); + } } floaters_to_move.clear(); @@ -1931,7 +1935,9 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus) if (dependent) { sendChildToFront(dependent); - dependent->setMinimized(FALSE); + //don't un-minimize dependent windows automatically + // respect user's wishes + //dependent->setMinimized(FALSE); } ++dependent_it; } |