Second Life viewer sources 1.19.1.0

1 files changed, 32 insertions, 64 deletions

diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index b70edec..6c2d9fa 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -1,6 +1,5 @@
 /** 
  * @file llviewborder.cpp
- * @brief LLViewBorder base class
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
@@ -29,19 +28,9 @@
  * $/LicenseInfo$
  */
 
-// A customizable decorative border.  Does not interact with mouse events.              
-
 #include "linden_common.h"
-
 #include "llviewborder.h"
-
-#include "llgl.h"
-#include "llui.h"
-#include "llimagegl.h"
-//#include "llviewerimagelist.h"
-#include "llcontrol.h"
-#include "llglheaders.h"
-#include "v2math.h"
+#include "llglimmediate.h"
 #include "llfocusmgr.h"
 
 LLViewBorder::LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel, EStyle style, S32 width )
@@ -53,7 +42,6 @@ LLViewBorder::LLViewBorder( const LLString& name, const LLRect& rect, EBevel bev
         mHighlightDark( LLUI::sColorsGroup->getColor( "DefaultHighlightDark" ) ),
         mShadowLight( LLUI::sColorsGroup->getColor( "DefaultShadowLight" ) ),
         mShadowDark( LLUI::sColorsGroup->getColor( "DefaultShadowDark" ) ),
-//      mKeyboardFocusColor(LLUI::sColorsGroup->getColor( "FocusColor" ) ),
         mBorderWidth( width ),
         mTexture( NULL ),
         mHasKeyboardFocus( FALSE )
@@ -61,12 +49,6 @@ LLViewBorder::LLViewBorder( const LLString& name, const LLRect& rect, EBevel bev
         setFollowsAll();
 }
 
-// virtual
-BOOL LLViewBorder::isCtrl() const
-{
-        return FALSE;
-}
-
 void LLViewBorder::setColors( const LLColor4& shadow_dark, const LLColor4& highlight_light )
 {
         mShadowDark = shadow_dark;
@@ -160,15 +142,15 @@ void LLViewBorder::drawOnePixelLines()
         }
 
         S32 left        = 0;
-        S32 top         = mRect.getHeight();
-        S32 right       = mRect.getWidth();
+        S32 top         = getRect().getHeight();
+        S32 right       = getRect().getWidth();
         S32 bottom      = 0;
 
-        glColor4fv( top_color.mV );
+        gGL.color4fv( top_color.mV );
         gl_line_2d(left, bottom, left, top);
         gl_line_2d(left, top, right, top);
 
-        glColor4fv( bottom_color.mV );
+        gGL.color4fv( bottom_color.mV );
         gl_line_2d(right, top, right, bottom);
         gl_line_2d(left, bottom, right, bottom);
 
@@ -219,24 +201,24 @@ void LLViewBorder::drawTwoPixelLines()
         }
 
         S32 left        = 0;
-        S32 top         = mRect.getHeight();
-        S32 right       = mRect.getWidth();
+        S32 top         = getRect().getHeight();
+        S32 right       = getRect().getWidth();
         S32 bottom      = 0;
 
         // draw borders
-        glColor3fv( top_out_color );
+        gGL.color3fv( top_out_color );
         gl_line_2d(left, bottom, left, top-1);
         gl_line_2d(left, top-1, right, top-1);
 
-        glColor3fv( top_in_color );
+        gGL.color3fv( top_in_color );
         gl_line_2d(left+1, bottom+1, left+1, top-2);
         gl_line_2d(left+1, top-2, right-1, top-2);
 
-        glColor3fv( bottom_out_color );
+        gGL.color3fv( bottom_out_color );
         gl_line_2d(right-1, top-1, right-1, bottom);
         gl_line_2d(left, bottom, right, bottom);
 
-        glColor3fv( bottom_in_color );
+        gGL.color3fv( bottom_in_color );
         gl_line_2d(right-2, top-2, right-2, bottom+1);
         gl_line_2d(left+1, bottom+1, right-1, bottom+1);
 }
@@ -247,27 +229,27 @@ void LLViewBorder::drawTextures()
 
         llassert( FALSE );  // TODO: finish implementing
 
-        glColor4fv(UI_VERTEX_COLOR.mV);
+        gGL.color4fv(UI_VERTEX_COLOR.mV);
 
         mTexture->bind();
         glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
         glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-        drawTextureTrapezoid(   0.f, mBorderWidth, mRect.getWidth(),  0,                                        0 );
-        drawTextureTrapezoid(  90.f, mBorderWidth, mRect.getHeight(), (F32)mRect.getWidth(),0 );
-        drawTextureTrapezoid( 180.f, mBorderWidth, mRect.getWidth(),  (F32)mRect.getWidth(),(F32)mRect.getHeight() );
-        drawTextureTrapezoid( 270.f, mBorderWidth, mRect.getHeight(), 0,                                        (F32)mRect.getHeight() );
+        drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,                                    0 );
+        drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
+        drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(),  (F32)getRect().getWidth(),(F32)getRect().getHeight() );
+        drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0,                                    (F32)getRect().getHeight() );
 }
 
 
 void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y )
 {
-        glPushMatrix();
+        gGL.pushMatrix();
         {
-                glTranslatef(start_x, start_y, 0.f);
+                gGL.translatef(start_x, start_y, 0.f);
                 glRotatef( degrees, 0, 0, 1 );
 
-                glBegin(GL_QUADS);
+                gGL.begin(GL_QUADS);
                 {
                         //      width, width   /---------\ length-width, width          //
                         //                                    /           \                                                     //
@@ -275,24 +257,24 @@ void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32
                         //                                  /---------------\                                           //
                         //                      0,0                                       length, 0                             //
 
-                        glTexCoord2f( 0, 0 );
-                        glVertex2i( 0, 0 );
+                        gGL.texCoord2f( 0, 0 );
+                        gGL.vertex2i( 0, 0 );
 
-                        glTexCoord2f( (GLfloat)length, 0 );
-                        glVertex2i( length, 0 );
+                        gGL.texCoord2f( (GLfloat)length, 0 );
+                        gGL.vertex2i( length, 0 );
 
-                        glTexCoord2f( (GLfloat)(length - width), (GLfloat)width );
-                        glVertex2i( length - width, width );
+                        gGL.texCoord2f( (GLfloat)(length - width), (GLfloat)width );
+                        gGL.vertex2i( length - width, width );
 
-                        glTexCoord2f( (GLfloat)width, (GLfloat)width );
-                        glVertex2i( width, width );
+                        gGL.texCoord2f( (GLfloat)width, (GLfloat)width );
+                        gGL.vertex2i( width, width );
                 }
-                glEnd();
+                gGL.end();
         }
-        glPopMatrix();
+        gGL.popMatrix();
 }
 
-bool LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style)
+BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style)
 {
         if (node->hasAttribute("bevel_style"))
         {
@@ -316,25 +298,11 @@ bool LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel
                 {
                         bevel_style = LLViewBorder::BEVEL_BRIGHT;
                 }
-                return true;
+                return TRUE;
         }
-        return false;
-}
-
-void LLViewBorder::setValue(const LLSD& val)
-{
-        setRect(LLRect(val));
-}
-
-EWidgetType LLViewBorder::getWidgetType() const
-{
-        return WIDGET_TYPE_VIEW_BORDER;
+        return FALSE;
 }
 
-LLString LLViewBorder::getWidgetTag() const
-{
-        return LL_VIEW_BORDER_TAG;
-}
 
 // static
 LLView* LLViewBorder::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)