Second Life viewer sources 1.17.1.0

14 files changed, 140 insertions, 56 deletions

diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index d389236..1add4a4 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -162,6 +162,15 @@ public:
                         return FALSE;
                 }
         }
+
+        void setIgnore(bool state)
+        {
+                if (mIgnorable)
+                {
+                        LLAlertDialog::sSettings->setWarning(mIgnoreLabel, !state);
+                }
+        }
+
         
 public:
         LLString mLabel;                        // Handle for access from code, etc
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index e00454a..27df619 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -66,8 +66,8 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
         mAllowTextEntry(FALSE),
         mMaxChars(20),
         mTextEntryTentative(TRUE),
-        mPrearrangeCallback( NULL ),
         mListPosition(BELOW),
+        mPrearrangeCallback( NULL ),
         mTextEntryCallback( NULL )
 {
         // For now, all comboboxes don't take keyboard focus when clicked.
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index 3b71942..d3b83a2 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -25,6 +25,7 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  */
+#include "linden_common.h"
 
 #include "llctrlselectioninterface.h"
 
diff --git a/linden/indra/llui/lleditmenuhandler.cpp b/linden/indra/llui/lleditmenuhandler.cpp
index 85b4464..559cef4 100644
--- a/linden/indra/llui/lleditmenuhandler.cpp
+++ b/linden/indra/llui/lleditmenuhandler.cpp
@@ -26,7 +26,7 @@
  * COMPLETENESS OR PERFORMANCE.
 */
 
-#include "stdtypes.h"
+#include "linden_common.h"
 
 #include "lleditmenuhandler.h"
 
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 44616b9..98286fa 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -220,6 +220,9 @@ LLString LLLineEditor::getWidgetTag() const
 
 void LLLineEditor::onFocusLost()
 {
+        // Need to notify early when loosing focus.
+        getWindow()->allowLanguageTextInput(FALSE);
+
         LLUICtrl::onFocusLost();
 
         if( mCommitOnFocusLost && mText.getString() != mPrevText) 
@@ -1130,7 +1133,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 
         // handle ctrl-uparrow if we have a history enabled line editor.
         case KEY_UP:
-                if( mHaveHistory && ( MASK_CONTROL & mask ) )
+                if( mHaveHistory && ( MASK_CONTROL == mask ) )
                 {
                         if( mCurrentHistoryLine > 0 )
                         {
@@ -1147,7 +1150,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 
         // handle ctrl-downarrow if we have a history enabled line editor
         case KEY_DOWN:
-                if( mHaveHistory  && ( MASK_CONTROL & mask ) )
+                if( mHaveHistory  && ( MASK_CONTROL == mask ) )
                 {
                         if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.size() - 1 )
                         {
@@ -1646,6 +1649,12 @@ void LLLineEditor::setFocus( BOOL new_state )
 {
         BOOL old_state = hasFocus();
 
+        if (!new_state)
+        {
+                getWindow()->allowLanguageTextInput(FALSE);
+        }
+
+
         // getting focus when we didn't have it before, and we want to select all
         if (!old_state && new_state && mSelectAllonFocusReceived)
         {
@@ -1676,6 +1685,16 @@ void LLLineEditor::setFocus( BOOL new_state )
         }
 
         LLUICtrl::setFocus( new_state );
+
+        if (new_state)
+        {
+                // Allow Language Text Input only when this LineEditor has
+                // no prevalidate function attached.  This criterion works
+                // fine on 1.15.0.2, since all prevalidate func reject any
+                // non-ASCII characters.  I'm not sure on future versions,
+                // however.
+                getWindow()->allowLanguageTextInput(mPrevalidateFunc == NULL);
+        }
 }
 
 //virtual 
diff --git a/linden/indra/llui/llrootview.cpp b/linden/indra/llui/llrootview.cpp
index d78244d..bf231f1 100644
--- a/linden/indra/llui/llrootview.cpp
+++ b/linden/indra/llui/llrootview.cpp
@@ -25,6 +25,7 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  */
+#include "linden_common.h"
 
 #include "llrootview.h"
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index cf43ee1..be41aa8 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -292,7 +292,26 @@ BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
         // Opaque
         return TRUE;
 }
+BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContainerView::SCROLL_ORIENTATION axis)
+{
+        if(mScrollbar[axis]->getVisible())
+        {
+                LLRect inner_rect_local( 0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0 );
+                const S32 AUTOSCROLL_SIZE = 10;
+                if(mScrollbar[axis]->getVisible())
+                {
+                        inner_rect_local.mRight -= SCROLLBAR_SIZE;
+                        inner_rect_local.mTop += AUTOSCROLL_SIZE;
+                        inner_rect_local.mBottom = inner_rect_local.mTop - AUTOSCROLL_SIZE;
+                }
+                if( inner_rect_local.pointInRect( x, y ) && (mScrollbar[axis]->getDocPos() > 0) )
+                {
+                        return TRUE;
+                }
 
+        }
+        return FALSE;
+}
 BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
                                                                                                   BOOL drop,
                                                                                                   EDragAndDropType cargo_type,
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 3b3bbef..34fff9c 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -35,6 +35,7 @@
 #endif
 #include "stdenums.h"
 #include "llcoord.h"
+#include "llscrollbar.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLScrollableContainerView
@@ -47,7 +48,6 @@
 // This class is a decorator class.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLScrollbar;
 class LLViewBorder;
 class LLUICtrlFactory;
 
@@ -55,6 +55,10 @@ class LLUICtrlFactory;
 class LLScrollableContainerView : public LLUICtrl
 {
 public:
+        // Note: vertical comes before horizontal because vertical
+        // scrollbars have priority for mouse and keyboard events.
+        enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
+
         LLScrollableContainerView( const LLString& name, const LLRect& rect,
                                                            LLView* scrolled_view, BOOL is_opaque = FALSE,
                                                            const LLColor4& bg_color = LLColor4(0,0,0,0) );
@@ -88,6 +92,8 @@ public:
         void                    goToBottom();
         S32                             getBorderWidth();
 
+        BOOL                    needsToScroll(S32 x, S32 y, SCROLL_ORIENTATION axis);
+
         // LLView functionality
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent);
         virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
@@ -110,10 +116,6 @@ protected:
         virtual void scrollVertical( S32 new_pos );
         void updateScroll();
 
-        // Note: vertical comes before horizontal because vertical
-        // scrollbars have priority for mouse and keyboard events.
-        enum { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
-
         LLScrollbar* mScrollbar[SCROLLBAR_COUNT];
         LLView*         mScrolledView;
         S32                     mSize;
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index fd98bd5..5571d39 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -98,8 +98,10 @@ protected:
 //
 // LLScrollListIcon
 //
-LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) :
-mIcon(icon), mColor(LLColor4::white), mImageUUID(image_id.asString())
+LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id)
+        : mIcon(icon),
+          mImageUUID(image_id.asString()),
+          mColor(LLColor4::white)
 {
         if (width)
         {
@@ -431,21 +433,20 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ),
         mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ),
         mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
-        mHighlightedItem(-1),
         mBorderThickness( 2 ),
         mOnDoubleClickCallback( NULL ),
         mOnMaximumSelectCallback( NULL ),
         mOnSortChangedCallback( NULL ),
-        mDrewSelected(FALSE),
+        mHighlightedItem(-1),
         mBorder(NULL),
-        mSearchColumn(0),
         mDefaultColumn("SIMPLE"),
-
+        mSearchColumn(0),
         mNumDynamicWidthColumns(0),
         mTotalStaticColumnWidth(0),
         mSortColumn(-1),
+        mSortAscending(TRUE),
         mSorted(TRUE),
-        mSortAscending(TRUE)
+        mDrewSelected(FALSE)
 {
         mItemListRect.setOriginAndSize(
                 mBorderThickness + LIST_BORDER_PAD,
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 429985b..9829832 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -328,7 +328,7 @@ public:
         
         S32             getNumColumns() const                           { return mColumns.size(); }
 
-        LLScrollListCell *getColumn(const S32 i) const  { if (i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
+        LLScrollListCell *getColumn(const S32 i) const  { if (0 <= i && i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
 
         virtual BOOL handleClick(S32 x, S32 y, MASK mask);
 
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 44940ae..01c06c3 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -51,6 +51,7 @@
 #include "llglheaders.h"
 
 const F32 SCROLL_STEP_TIME = 0.4f;
+const F32 SCROLL_DELAY_TIME = 0.5f;
 const S32 TAB_PADDING = 15;
 const S32 TABCNTR_TAB_MIN_WIDTH = 60;
 const S32 TABCNTR_TAB_MAX_WIDTH = 150;
@@ -81,6 +82,7 @@ LLTabContainerCommon::LLTabContainerCommon(
         mLockedTabCount(0)
 { 
         setMouseOpaque(FALSE);
+        mDragAndDropDelayTimer.stop();
 }
 
 
@@ -101,9 +103,11 @@ LLTabContainerCommon::LLTabContainerCommon(
         mCallbackUserdata( callback_userdata ),
         mTitleBox(NULL),
         mTopBorderHeight(LLPANEL_BORDER_WIDTH),
-        mTabPosition(pos)
+        mTabPosition(pos),
+        mLockedTabCount(0)
 {
         setMouseOpaque(FALSE);
+        mDragAndDropDelayTimer.stop();
 }
 
 
@@ -731,8 +735,8 @@ LLTabContainer::LLTabContainer(
         : 
         LLTabContainerCommon(name, rect, pos, close_callback, callback_userdata, bordered),
         mLeftArrowBtn(NULL),
-        mRightArrowBtn(NULL),
         mJumpLeftArrowBtn(NULL),
+        mRightArrowBtn(NULL),
         mJumpRightArrowBtn(NULL),
         mRightTabBtnOffset(0),
         mMinTabWidth(TABCNTR_TAB_MIN_WIDTH),
@@ -749,8 +753,8 @@ LLTabContainer::LLTabContainer(
         : 
         LLTabContainerCommon(name, rect_control, pos, close_callback, callback_userdata, bordered),
         mLeftArrowBtn(NULL),
-        mRightArrowBtn(NULL),
         mJumpLeftArrowBtn(NULL),
+        mRightArrowBtn(NULL),
         mJumpRightArrowBtn(NULL),
         mRightTabBtnOffset(0),
         mMinTabWidth(TABCNTR_TAB_MIN_WIDTH),
@@ -1576,43 +1580,48 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 {
         BOOL has_scroll_arrows = (mMaxScrollPos > 0);
 
-        if (has_scroll_arrows)
+        if( mDragAndDropDelayTimer.getElapsedTimeF32() > SCROLL_DELAY_TIME )
         {
-                if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
-                {
-                        S32     local_x = x     - mJumpLeftArrowBtn->getRect().mLeft;
-                        S32     local_y = y     - mJumpLeftArrowBtn->getRect().mBottom;
-                        mJumpLeftArrowBtn->handleHover(local_x, local_y, mask);
-                }
-                if (mJumpRightArrowBtn->getRect().pointInRect(x,        y))
-                {
-                        S32     local_x = x     - mJumpRightArrowBtn->getRect().mLeft;
-                        S32     local_y = y     - mJumpRightArrowBtn->getRect().mBottom;
-                        mJumpRightArrowBtn->handleHover(local_x,        local_y, mask);
-                }
-                if (mLeftArrowBtn->getRect().pointInRect(x,     y))
-                {
-                        S32     local_x = x     - mLeftArrowBtn->getRect().mLeft;
-                        S32     local_y = y     - mLeftArrowBtn->getRect().mBottom;
-                        mLeftArrowBtn->handleHover(local_x,     local_y, mask);
-                }
-                else if (mRightArrowBtn->getRect().pointInRect(x, y))
+
+                if (has_scroll_arrows)
                 {
-                        S32     local_x = x     - mRightArrowBtn->getRect().mLeft;
-                        S32     local_y = y     - mRightArrowBtn->getRect().mBottom;
-                        mRightArrowBtn->handleHover(local_x, local_y, mask);
+                        if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
+                        {
+                                S32     local_x = x     - mJumpLeftArrowBtn->getRect().mLeft;
+                                S32     local_y = y     - mJumpLeftArrowBtn->getRect().mBottom;
+                                mJumpLeftArrowBtn->handleHover(local_x, local_y, mask);
+                        }
+                        if (mJumpRightArrowBtn->getRect().pointInRect(x,        y))
+                        {
+                                S32     local_x = x     - mJumpRightArrowBtn->getRect().mLeft;
+                                S32     local_y = y     - mJumpRightArrowBtn->getRect().mBottom;
+                                mJumpRightArrowBtn->handleHover(local_x,        local_y, mask);
+                        }
+                        if (mLeftArrowBtn->getRect().pointInRect(x,     y))
+                        {
+                                S32     local_x = x     - mLeftArrowBtn->getRect().mLeft;
+                                S32     local_y = y     - mLeftArrowBtn->getRect().mBottom;
+                                mLeftArrowBtn->handleHover(local_x,     local_y, mask);
+                        }
+                        else if (mRightArrowBtn->getRect().pointInRect(x, y))
+                        {
+                                S32     local_x = x     - mRightArrowBtn->getRect().mLeft;
+                                S32     local_y = y     - mRightArrowBtn->getRect().mBottom;
+                                mRightArrowBtn->handleHover(local_x, local_y, mask);
+                        }
                 }
-        }
 
-        for(tuple_list_t::iterator iter = mTabList.begin();     iter !=  mTabList.end(); ++iter)
-        {
-                LLTabTuple*     tuple = *iter;
-                tuple->mButton->setVisible(     TRUE );
-                S32     local_x = x     - tuple->mButton->getRect().mLeft;
-                S32     local_y = y     - tuple->mButton->getRect().mBottom;
-                if (tuple->mButton->pointInView(local_x, local_y) &&  tuple->mButton->getEnabled() && !tuple->mTabPanel->getVisible())
+                for(tuple_list_t::iterator iter = mTabList.begin();     iter !=  mTabList.end(); ++iter)
                 {
-                        tuple->mButton->onCommit();
+                        LLTabTuple*     tuple = *iter;
+                        tuple->mButton->setVisible(     TRUE );
+                        S32     local_x = x     - tuple->mButton->getRect().mLeft;
+                        S32     local_y = y     - tuple->mButton->getRect().mBottom;
+                        if (tuple->mButton->pointInView(local_x, local_y) &&  tuple->mButton->getEnabled() && !tuple->mTabPanel->getVisible())
+                        {
+                                tuple->mButton->onCommit();
+                                mDragAndDropDelayTimer.stop();
+                        }
                 }
         }
 
@@ -1641,4 +1650,4 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name)
                 // tabs have changed size, might need to scroll to see current tab
                 updateMaxScrollPos();
         }
-}
\ No newline at end of file
+}
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 7d501d2..f3365c3 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -117,7 +117,9 @@ public:
         virtual void setTabImage(LLPanel* child, std::string img_name);
         void            setTitle( const LLString& title );
         const LLString getPanelTitle(S32 index);
-        
+
+        void            setDragAndDropDelayTimer() { mDragAndDropDelayTimer.start(); }
+
         virtual void            setTopBorderHeight(S32 height);
         
         virtual void            setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*,bool));
@@ -175,6 +177,8 @@ protected:
         S32                                                             mScrollPosPixels;
         S32                                                             mMaxScrollPos;
 
+        LLFrameTimer                                    mDragAndDropDelayTimer;
+
         void                                                    (*mCloseCallback)(void*);
         void*                                                   mCallbackUserdata;
 
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 80205d3..513670b 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -46,6 +46,7 @@
 #include "llclipboard.h"
 #include "llscrollbar.h"
 #include "llstl.h"
+#include "llstring.h"
 #include "llkeyboard.h"
 #include "llkeywords.h"
 #include "llundo.h"
@@ -514,8 +515,10 @@ void LLTextEditor::truncate()
 
 void LLTextEditor::setText(const LLString &utf8str)
 {
-        mUTF8Text = utf8str;
-        mWText = utf8str_to_wstring(utf8str);
+        // LLString::removeCRLF(utf8str);
+        mUTF8Text = utf8str_removeCRLF(utf8str);
+        // mUTF8Text = utf8str;
+        mWText = utf8str_to_wstring(mUTF8Text);
         mTextIsUpToDate = TRUE;
 
         truncate();
@@ -2491,6 +2494,8 @@ void LLTextEditor::redo()
 // virtual, from LLView
 void LLTextEditor::onFocusLost()
 {
+        getWindow()->allowLanguageTextInput(FALSE);
+
         // Route menu back to the default
         if( gEditMenuHandler == this )
         {
@@ -3057,6 +3062,12 @@ void LLTextEditor::setFocus( BOOL new_state )
         // Don't change anything if the focus state didn't change
         if (new_state == old_state) return;
 
+        // Notify early if we are loosing focus.
+        if (!new_state)
+        {
+                getWindow()->allowLanguageTextInput(FALSE);
+        }
+
         LLUICtrl::setFocus( new_state );
 
         if( new_state )
@@ -3077,6 +3088,12 @@ void LLTextEditor::setFocus( BOOL new_state )
 
                 endSelection();
         }
+
+        // Notify late if we are gaining focus.
+        if (new_state && !mReadOnly)
+        {
+                getWindow()->allowLanguageTextInput(TRUE);
+        }
 }
 
 BOOL LLTextEditor::acceptsTextInput() const
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index 3f9ccf4..65f191b 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -26,6 +26,8 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
+
 #include "llview.h"
 #include "lluictrl.h"
 #include "llviewquery.h"