Second Life viewer sources 1.15.1.3

1 files changed, 17 insertions, 4 deletions

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 12758b3..1613fd7 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -696,7 +696,13 @@ void LLFloater::translate(S32 x, S32 y)
 
 BOOL LLFloater::canSnapTo(LLView* other_view)
 {
-        if (other_view && other_view != getParent())
+        if (NULL == other_view)
+        {
+                llwarns << "other_view is NULL" << llendl;
+                return FALSE;
+        }
+
+        if (other_view != getParent())
         {
                 LLFloater* other_floaterp = (LLFloater*)other_view;
                 
@@ -1933,7 +1939,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();
 
@@ -1945,7 +1955,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;
         }
@@ -2555,6 +2567,7 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
         if (!mTabContainer)
         {
                 llerrs << "Tab Container used without having been initialized." << llendl;
+                return;
         }
 
         if (floaterp->getHost() == this)
@@ -2718,7 +2731,7 @@ void LLMultiFloater::setVisible(BOOL visible)
 BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 {
         if (getEnabled()
-                && mask == (MASK_CONTROL|MASK_SHIFT))
+                && mask == MASK_CONTROL)
         {
                 if (key == 'W')
                 {