diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
| commit | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (patch) | |
| tree | 2318b3c35d1b673ba819794c094e6d8e4bad3500 /indra/newview/lltexturectrl.cpp | |
| parent | 2efd4f40af8df78d5b34c1449b1a99e3f570cae5 (diff) | |
| parent | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (diff) | |
merge from default branch
--HG--
branch : product-engine
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 |