aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llmenugl.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/llmenugl.h')
-rw-r--r--linden/indra/llui/llmenugl.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 9a9d1b0..3b57a32 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -514,10 +514,8 @@ public:
514 514
515 // background colors 515 // background colors
516 static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; } 516 static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; }
517 void setBackgroundColor( const LLColor4& color ); 517 void setBackgroundColor( const LLColor4& color );
518 void setBorderColor( const LLColor4& color );
519 const LLColor4& getBackgroundColor() const { return mBackgroundColor; } 518 const LLColor4& getBackgroundColor() const { return mBackgroundColor; }
520 const LLColor4& getBorderColor() const { return mBorderColor; }
521 void setBackgroundVisible( BOOL b ) { mBgVisible = b; } 519 void setBackgroundVisible( BOOL b ) { mBgVisible = b; }
522 void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>()); 520 void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
523 521
@@ -631,7 +629,6 @@ private:
631 static BOOL sKeyboardMode; 629 static BOOL sKeyboardMode;
632 630
633 LLColor4 mBackgroundColor; 631 LLColor4 mBackgroundColor;
634 LLColor4 mBorderColor;
635 BOOL mBgVisible; 632 BOOL mBgVisible;
636 LLMenuItemGL* mParentMenuItem; 633 LLMenuItemGL* mParentMenuItem;
637 LLUIString mLabel; 634 LLUIString mLabel;