diff options
| author | callum_linden <none@none> | 2014-10-17 16:52:32 -0700 | 
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 16:52:32 -0700 | 
| commit | 7359e9300a8188f453e7cff39af2cac3dd8831ee (patch) | |
| tree | ea03685c9036da2001b6b8eb9c472bfab64c9592 /indra | |
| parent | f7e4c27add56952a7d2d0fb475e439922640825e (diff) | |
Update to build on Xcode 6.0:  collection of removal of unused const variables [-Wunused-const-variable]
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llaccordionctrl.cpp | 8 | ||||
| -rwxr-xr-x | indra/llui/llcheckboxctrl.cpp | 2 | ||||
| -rwxr-xr-x | indra/llui/llconsole.cpp | 1 | ||||
| -rwxr-xr-x | indra/llui/lldraghandle.cpp | 1 | ||||
| -rwxr-xr-x | indra/llui/llfolderview.cpp | 1 | ||||
| -rwxr-xr-x | indra/llui/llmenugl.cpp | 7 | 
6 files changed, 0 insertions, 20 deletions
| diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index b787794b95..3067d9d1ba 100755 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -36,25 +36,17 @@  #include "boost/bind.hpp" -static const S32 DRAGGER_BAR_MARGIN = 4; -static const S32 DRAGGER_BAR_HEIGHT = 5;  static const S32 BORDER_MARGIN = 2;  static const S32 PARENT_BORDER_MARGIN = 5; - -static const S32 panel_delta = DRAGGER_BAR_MARGIN;  // Distanse between two panels  - -static const S32 HORIZONTAL_MULTIPLE = 8;  static const S32 VERTICAL_MULTIPLE = 16;  static const F32 MIN_AUTO_SCROLL_RATE = 120.f;  static const F32 MAX_AUTO_SCROLL_RATE = 500.f;  static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f; -  // LLAccordionCtrl =================================================================|  static LLDefaultChildRegistry::Register<LLAccordionCtrl>	t2("accordion"); -  LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)   , mFitParent(params.fit_parent)   , mAutoScrolling( false ) diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 5525520d78..eee6339caf 100755 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -41,8 +41,6 @@  #include "lltextbox.h"  #include "llkeyboard.h" -const U32 MAX_STRING_LENGTH = 10; -  static LLDefaultChildRegistry::Register<LLCheckBoxCtrl> r("check_box");  // Compiler optimization, generate extern template diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index fdfaf284de..26ae31cac6 100755 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -52,7 +52,6 @@ extern void AddNewDebugConsoleToLCD(const LLWString &newLine);  LLConsole* gConsole = NULL;  // Created and destroyed in LLViewerWindow.  const F32 FADE_DURATION = 2.f; -const S32 MIN_CONSOLE_WIDTH = 200;  static LLDefaultChildRegistry::Register<LLConsole> r("console"); diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 7c6559eddb..48bf5bb80f 100755 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -46,7 +46,6 @@ const S32 LEADING_PAD = 5;  const S32 TITLE_HPAD = 8;  const S32 BORDER_PAD = 1;  const S32 LEFT_PAD = BORDER_PAD + TITLE_HPAD + LEADING_PAD; -const S32 RIGHT_PAD = BORDER_PAD + 32; // HACK: space for close btn and minimize btn  S32 LLDragHandle::sSnapMargin = 5; diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 474b545f00..e20d6734f1 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -53,7 +53,6 @@  /// Local function declarations, constants, enums, and typedefs  ///---------------------------------------------------------------------------- -const S32 RENAME_WIDTH_PAD = 4;  const S32 RENAME_HEIGHT_PAD = 1;  const S32 AUTO_OPEN_STACK_DEPTH = 16; diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 604dc92789..8ef2b4ef5b 100755 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -100,17 +100,10 @@ const std::string LLMenuGL::ARROW_DOWN("vvvvvvv");  const F32 MAX_MOUSE_SLOPE_SUB_MENU = 0.9f; -const S32 PIE_GESTURE_ACTIVATE_DISTANCE = 10; -  BOOL LLMenuGL::sKeyboardMode = FALSE;  LLHandle<LLView> LLMenuHolderGL::sItemLastSelectedHandle;  LLFrameTimer LLMenuHolderGL::sItemActivationTimer; -//LLColor4 LLMenuGL::sBackgroundColor( 0.8f, 0.8f, 0.0f, 1.0f ); - -const S32 PIE_CENTER_SIZE = 20;		// pixels, radius of center hole -const F32 PIE_SCALE_FACTOR = 1.7f; // scale factor for pie menu when mouse is initially down -const F32 PIE_SHRINK_TIME = 0.2f; // time of transition between unbounded and bounded display of pie menu  const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f; | 
