Second Life viewer sources 1.19.0.2

1 files changed, 12 insertions, 23 deletions

diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 04d33a6..39398b0 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -973,18 +973,10 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
                 }
         }
 
-        if( !handled && !called_from_parent)
+        if( !handled && !called_from_parent && mParentView)
         {
-                if (mIsFocusRoot)
-                {
-                        // stop processing at focus root
-                        handled = FALSE;
-                }
-                else if (mParentView)
-                {
-                        // Upward traversal
-                        handled = mParentView->handleKey( key, mask, FALSE );
-                }
+                // Upward traversal
+                handled = mParentView->handleKey( key, mask, FALSE );
         }
         return handled;
 }
@@ -1019,18 +1011,10 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
         }
 
 
-        if (!handled && !called_from_parent)
+        if (!handled && !called_from_parent && mParentView)
         {
-                if (mIsFocusRoot)
-                {
-                        // stop processing at focus root
-                        handled = FALSE;
-                }
-                else if(mParentView)
-                {
-                        // Upward traversal
-                        handled = mParentView->handleUnicodeChar(uni_char, FALSE);
-                }
+                // Upward traversal
+                handled = mParentView->handleUnicodeChar(uni_char, FALSE);
         }
 
         return handled;
@@ -1666,7 +1650,12 @@ void LLView::updateBoundingRect()
                 for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
                 {
                         LLView* childp = *child_it;
-                        if (!childp->getVisible()) continue;
+                        // ignore invisible and "top" children when calculating bounding rect
+                        // such as combobox popups
+                        if (!childp->getVisible() || childp == gFocusMgr.getTopCtrl()) 
+                        {
+                                continue;
+                        }
 
                         LLRect child_bounding_rect = childp->getBoundingRect();