diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
commit | 6cea252986ef6d33f2e37333a286362b8e0272c5 (patch) | |
tree | ec0e4d56a9dc2d8a97cc9bce4744b097f4b7efe4 /indra/newview/llbottomtray.h | |
parent | 2b0a997b13de15c7aae009b52d7353c97e1781f3 (diff) | |
parent | 815f336a157cc33233633deed66634195d3dc552 (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r-- | indra/newview/llbottomtray.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 974289d5e0..8989816bfe 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -101,8 +101,6 @@ private: , RS_RESIZABLE_BUTTONS = /*RS_BUTTON_SNAPSHOT | */RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES }EResizeState; - void updateResizeState(S32 new_width, S32 cur_width); - void verifyChildControlsSizes(); S32 processWidthDecreased(S32 delta_width); void processWidthIncreased(S32 delta_width); void log(LLView* panel, const std::string& descr); |