diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 09:58:41 -0400 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 09:58:41 -0400 |
| commit | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (patch) | |
| tree | 6f6ede75171952788ddd1037b58cc67340eaec74 /indra/newview/llfloatercamera.cpp | |
| parent | 283b862814996dad24ce1e896122465fede118a1 (diff) | |
| parent | 4dd6626c800988f70925d7687f0a4b7bbe20694b (diff) | |
Merge commit.
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) |