Second Life viewer sources 1.14.0.0

1 files changed, 20 insertions, 14 deletions

diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index c2c29bb..8d3fba6 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -183,10 +183,11 @@ void LLPanel::draw()
                 // draw background
                 if( mBgVisible )
                 {
-                        S32 left = LLPANEL_BORDER_WIDTH;
-                        S32 top = mRect.getHeight() - LLPANEL_BORDER_WIDTH;
-                        S32 right = mRect.getWidth() - LLPANEL_BORDER_WIDTH;
-                        S32 bottom = LLPANEL_BORDER_WIDTH;
+                        //RN: I don't see the point of this
+                        S32 left = 0;//LLPANEL_BORDER_WIDTH;
+                        S32 top = mRect.getHeight();// - LLPANEL_BORDER_WIDTH;
+                        S32 right = mRect.getWidth();// - LLPANEL_BORDER_WIDTH;
+                        S32 bottom = 0;//LLPANEL_BORDER_WIDTH;
 
                         if (mBgOpaque )
                         {
@@ -357,16 +358,6 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                 gFocusMgr.childHasKeyboardFocus(this) && !called_from_parent )
         {
                 LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
-                if (key == KEY_RETURN && mask == MASK_NONE)
-                {
-                        // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
-                        if (cur_focus && cur_focus->acceptsTextInput())
-                        {
-                                cur_focus->onCommit();
-                                handled = TRUE;
-                        }
-                }
-
                 // If we have a default button, click it when
                 // return is pressed, unless current focus is a return-capturing button
                 // in which case *that* button will handle the return key
@@ -382,6 +373,16 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                                 handled = TRUE;
                         }
                 }
+
+                if (key == KEY_RETURN && mask == MASK_NONE)
+                {
+                        // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
+                        if (cur_focus && cur_focus->acceptsTextInput())
+                        {
+                                cur_focus->onCommit();
+                                handled = TRUE;
+                        }
+                }
         }
 
         return handled;
@@ -478,6 +479,11 @@ void LLPanel::setBackgroundColor(const LLColor4& color)
         mBgColorOpaque = color;
 }
 
+LLColor4 LLPanel::getBackgroundColor()
+{
+        return mBgColorOpaque;
+}
+
 void LLPanel::setTransparentColor(const LLColor4& color)
 {
         mBgColorAlpha = color;