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/lltexturectrl.cpp | |
| parent | a74e12d26b645063c4373c8354667423dec2d3f0 (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
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 |