diff options
| author | callum <none@none> | 2009-10-29 17:35:38 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-29 17:35:38 -0700 |
| commit | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (patch) | |
| tree | 01ffd01779af951f298753d5ec7ea08f3272d9d7 /indra/newview/llfloatercamera.cpp | |
| parent | b4bd34bd73b2be74afd08785c88b66b2fadd5bfc (diff) | |
| parent | 07647fdc5e02f893905d40af00e9ad4ffbc4ae5a (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) |