diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
| commit | 22e29b1a856343a13ca5c3f015226cf6544fd9e8 (patch) | |
| tree | 78b4dc789106678ebb1643f49a5d090e323db05a /indra/newview/llfloatercamera.cpp | |
| parent | a74e12d26b645063c4373c8354667423dec2d3f0 (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
merge
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) |