diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
commit | 85f54aca0f9c93b60e89e79b70bdb1d88b3bc5d6 (patch) | |
tree | e605c21a938a5ba794df6e43607de8c4a0d81008 /indra/newview/llscrollingpanelparam.h | |
parent | 88782e75462ac3a959a59be97ff50b5fc34aabb9 (diff) | |
parent | d05353fc3997f29bcf55a2fa49936e690b0725de (diff) |
automated merge
Diffstat (limited to 'indra/newview/llscrollingpanelparam.h')
-rw-r--r-- | indra/newview/llscrollingpanelparam.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h index 8c5db64816..fe4ce07166 100644 --- a/indra/newview/llscrollingpanelparam.h +++ b/indra/newview/llscrollingpanelparam.h @@ -75,13 +75,8 @@ public: // Constants for LLPanelVisualParam const static F32 PARAM_STEP_TIME_THRESHOLD; - const static S32 BTN_BORDER; const static S32 PARAM_HINT_WIDTH; const static S32 PARAM_HINT_HEIGHT; - const static S32 PARAM_HINT_LABEL_HEIGHT; - const static S32 PARAM_PANEL_WIDTH; - const static S32 PARAM_PANEL_HEIGHT; - public: LLViewerVisualParam* mParam; |