From adaae9e082fb9200e2ea1c7cbc6e26cb5de35fa1 Mon Sep 17 00:00:00 2001 From: Neal Orman <nyx@lindenlab.com> Date: Fri, 16 Oct 2009 19:13:44 +0000 Subject: [PATCH] Changing declaration of static constant member variables to match exact required format. Windows and Linux glossed over this issue, but mac was more picky. Fix code reviewed by Bigpapi. --- indra/newview/llscrollingpanelparam.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp index 1013d5adb7a..0a520ff65fb 100644 --- a/indra/newview/llscrollingpanelparam.cpp +++ b/indra/newview/llscrollingpanelparam.cpp @@ -45,14 +45,14 @@ #include "llvoavatarself.h" // Constants for LLPanelVisualParam -const static F32 PARAM_STEP_TIME_THRESHOLD = 0.25f; - -const static S32 BTN_BORDER = 2; -const static S32 PARAM_HINT_WIDTH = 128; -const static S32 PARAM_HINT_HEIGHT = 128; -const static S32 PARAM_HINT_LABEL_HEIGHT = 16; -const static S32 PARAM_PANEL_WIDTH = 2 * (3* BTN_BORDER + PARAM_HINT_WIDTH + LLPANEL_BORDER_WIDTH); -const static S32 PARAM_PANEL_HEIGHT = 2 * BTN_BORDER + PARAM_HINT_HEIGHT + PARAM_HINT_LABEL_HEIGHT + 4 * LLPANEL_BORDER_WIDTH; +const F32 LLScrollingPanelParam::PARAM_STEP_TIME_THRESHOLD = 0.25f; + +const S32 LLScrollingPanelParam::BTN_BORDER = 2; +const S32 LLScrollingPanelParam::PARAM_HINT_WIDTH = 128; +const S32 LLScrollingPanelParam::PARAM_HINT_HEIGHT = 128; +const S32 LLScrollingPanelParam::PARAM_HINT_LABEL_HEIGHT = 16; +const S32 LLScrollingPanelParam::PARAM_PANEL_WIDTH = 2 * (3* BTN_BORDER + PARAM_HINT_WIDTH + LLPANEL_BORDER_WIDTH); +const S32 LLScrollingPanelParam::PARAM_PANEL_HEIGHT = 2 * BTN_BORDER + PARAM_HINT_HEIGHT + PARAM_HINT_LABEL_HEIGHT + 4 * LLPANEL_BORDER_WIDTH; // LLScrollingPanelParam //static -- GitLab