diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
| commit | 8c7f5e902625173aada5377c5972b72a684bedf0 (patch) | |
| tree | 188d9445f4e610b2a6e05b6af667ab47d38e65a2 /indra/newview/lltexturectrl.cpp | |
| parent | c3b2f98012a32c0f241b814a27113e756961778c (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
branch merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index b5aec1b80b..4940d9b5bb 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -458,7 +458,7 @@ BOOL LLFloaterTexturePicker::postBuild() // virtual void LLFloaterTexturePicker::draw() { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + S32 floater_header_size = getHeaderHeight(); if (mOwner) { // draw cone of context pointing back to texture swatch |