Second Life viewer sources 1.19.1.0

1 files changed, 15 insertions, 23 deletions

diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index d9c2916..4e5dfee 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -1,6 +1,6 @@
 /** 
  * @file llviewborder.h
- * @brief LLViewBorder base class
+ * @brief A customizable decorative border.  Does not interact with mouse events.
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,64 +29,56 @@
  * $/LicenseInfo$
  */
 
-// A customizable decorative border.  Does not interact with mouse events.              
-
 #ifndef LL_LLVIEWBORDER_H
 #define LL_LLVIEWBORDER_H
 
 #include "llview.h"
-#include "v4color.h"
-#include "lluuid.h"
-#include "llimagegl.h"
-#include "llxmlnode.h"
-
-class LLUUID;
-class LLUICtrlFactory;
 
 
 class LLViewBorder : public LLView
 {
 public:
         enum EBevel { BEVEL_IN, BEVEL_OUT, BEVEL_BRIGHT, BEVEL_NONE };
-                
         enum EStyle { STYLE_LINE, STYLE_TEXTURE };
 
         LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 );
 
-        virtual void setValue(const LLSD& val);
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
+        virtual void setValue(const LLSD& val) { setRect(LLRect(val)); }
+        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_VIEW_BORDER; }
+        virtual LLString getWidgetTag() const { return LL_VIEW_BORDER_TAG; }
 
-        virtual BOOL isCtrl() const;
+        virtual BOOL isCtrl() const { return FALSE; }
 
         // llview functionality
         virtual void draw();
         
-        static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        static bool getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style);
+        static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
+        static BOOL getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style);
 
         void            setBorderWidth(S32 width)                       { mBorderWidth = width; }
+        S32                     getBorderWidth() const                          { return mBorderWidth; }
         void            setBevel(EBevel bevel)                          { mBevel = bevel; }
+        EBevel          getBevel() const                                        { return mBevel; }
         void            setColors( const LLColor4& shadow_dark, const LLColor4& highlight_light );
         void            setColorsExtended( const LLColor4& shadow_light, const LLColor4& shadow_dark,
                                                                    const LLColor4& highlight_light, const LLColor4& highlight_dark );
-        void            setTexture( const LLUUID &image_id );
+        void            setTexture( const class LLUUID &image_id );
+
+        LLColor4        getHighlightLight() {return mHighlightLight;}
+        LLColor4        getShadowDark() {return mHighlightDark;}
 
-        EBevel          getBevel() const { return mBevel; }
         EStyle          getStyle() const { return mStyle; }
-        S32                     getBorderWidth() const                          { return mBorderWidth; }
 
         void            setKeyboardFocusHighlight( BOOL b )     { mHasKeyboardFocus = b; }
 
-protected:
+private:
         void            drawOnePixelLines();
         void            drawTwoPixelLines();
         void            drawTextures();
         void            drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y );
 
-protected:
         EBevel          mBevel;
-        EStyle          mStyle;
+        const EStyle mStyle;
         LLColor4        mHighlightLight;
         LLColor4        mHighlightDark;
         LLColor4        mShadowLight;