diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-30 21:28:52 -0600 |
| commit | 01d06db0154e0cfc43c82664c6bf6129a3fa4883 (patch) | |
| tree | 3e842ddedf605d6883be7f04de55c173c38aa46b /indra/newview/llfloatercamera.cpp | |
| parent | 801301c435414df1e22c321a685044b7cd43055e (diff) | |
| parent | 9abcf6684e86b0b8c2d343ccd4864b2e854be3d7 (diff) | |
sync to the tip.
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) |