From 0b44e4d59b2c7cb60d65d4c3ab64cb33c49cda67 Mon Sep 17 00:00:00 2001 From: callum_linden <none@none> Date: Sat, 18 Oct 2014 11:09:07 -0700 Subject: Update to build on Xcode 6.0: more removal of unused const variables [-Wunused-const-variable] and member variables --- indra/llui/llview.cpp | 4 ---- indra/llui/llxuiparser.cpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 77c8878f4b..bdab4331e9 100755 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2164,10 +2164,6 @@ LLControlVariable *LLView::findControl(const std::string& name) return control_group.getControl(name); } -const S32 FLOATER_H_MARGIN = 15; -const S32 MIN_WIDGET_HEIGHT = 10; -const S32 VPAD = 4; - void LLView::initFromParams(const LLView::Params& params) { LLRect required_rect = getRequiredRect(); diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 37d88cb9f9..f6a44338a4 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -58,8 +58,6 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs; const char* NO_VALUE_MARKER = "no_value"; -const S32 LINE_NUMBER_HERE = 0; - struct MaxOccursValues : public LLInitParam::TypeValuesHelper<U32, MaxOccursValues> { static void declareValues() -- cgit v1.2.3