Second Life viewer sources 1.17.3.0

5 files changed, 14 insertions, 7 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 9829832..f1bd9bb 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -59,7 +59,7 @@ public:
         virtual S32                             getHeight() const = 0;
         virtual const LLString& getText() const { return LLString::null; }
         virtual const LLString& getTextLower() const { return LLString::null; }
-        virtual const BOOL              getVisible() const { return TRUE; }
+        virtual BOOL                    getVisible() const { return TRUE; }
         virtual void                    setWidth(S32 width) = 0;
         virtual void                    highlightText(S32 offset, S32 num_chars) {}
         virtual BOOL                    isText() = 0;
@@ -96,7 +96,7 @@ public:
         virtual void    setWidth(S32 width)                     { mWidth = width; }
         virtual S32             getHeight() const                       { return llround(mFont->getLineHeight()); }
         virtual const LLString&         getText() const         { return mText.getString(); }
-        virtual const BOOL                      getVisible() const  { return mVisible; }
+        virtual BOOL    getVisible() const  { return mVisible; }
         virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
         void                    setText(const LLString& text);
         virtual void    setColor(const LLColor4&);
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index c4f2cea..ba0747f 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -439,6 +439,7 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
                 text,
                 font,
                 FALSE);
+                
 
         LLFontGL::HAlign halign = LLView::selectFontHAlign(node);
         text_box->setHAlign(halign);
@@ -450,6 +451,12 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
         {
                 text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
         }
+        
+        BOOL mouse_opaque;
+        if (node->getAttributeBOOL("mouse_opaque", mouse_opaque))
+        {
+                text_box->setMouseOpaque(mouse_opaque);
+        }       
 
         if(node->hasAttribute("text_color"))
         {
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index 3093437..5056319 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -136,7 +136,7 @@ public:
         {
                 /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
                 {
-                        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl * const>(view)->hasTabStop() && children.size() == 0, TRUE);
+                        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->hasTabStop() && children.size() == 0, TRUE);
                 }
         };
 
@@ -144,7 +144,7 @@ public:
         {
                 /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
                 {
-                        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl * const>(view)->acceptsTextInput(), TRUE);
+                        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), TRUE);
                 }
         };
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 22d426a..0b04213 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -455,8 +455,8 @@ bool LLCompareByTabOrder::operator() (const LLView* const a, const LLView* const
         if(b && b->isCtrl()) b_score--;
         if(a_score == -2 && b_score == -2)
         {
-                const LLUICtrl * const a_ctrl = static_cast<const LLUICtrl* const>(a);
-                const LLUICtrl * const b_ctrl = static_cast<const LLUICtrl* const>(b);
+                const LLUICtrl * const a_ctrl = static_cast<const LLUICtrl*>(a);
+                const LLUICtrl * const b_ctrl = static_cast<const LLUICtrl*>(b);
                 LLView::child_tab_order_const_iter_t a_found = mTabOrder.find(a_ctrl), b_found = mTabOrder.find(b_ctrl);
                 if(a_found != mTabOrder.end()) a_score--;
                 if(b_found != mTabOrder.end()) b_score--;
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index 65f191b..314a483 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -49,7 +49,7 @@ filterResult_t LLEnabledFilter::operator() (const LLView* const view, const view
 }
 filterResult_t LLTabStopFilter::operator() (const LLView* const view, const viewList_t & children) const 
 {
-        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl* const>(view)->hasTabStop(),
+        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl*>(view)->hasTabStop(),
                                                 view->canFocusChildren());
 }