diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
| commit | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (patch) | |
| tree | 2318b3c35d1b673ba819794c094e6d8e4bad3500 /indra/newview/llfloatercamera.cpp | |
| parent | 2efd4f40af8df78d5b34c1449b1a99e3f570cae5 (diff) | |
| parent | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (diff) | |
merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index dca0773139..d1317f7c36 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -268,8 +268,8 @@ void LLFloaterCamera::updateState() LLRect controls_rect; if (childGetRect(CONTROLS, controls_rect)) { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); - static S32 height = controls_rect.getHeight() - floater_header_size; + S32 floater_header_size = getHeaderHeight(); + S32 height = controls_rect.getHeight() - floater_header_size; S32 newHeight = rect.getHeight(); if (showControls) |