diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 18:16:03 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 18:16:03 -0700 |
| commit | f93febc91407137bcad9cfe006633fd4a8ccb1e0 (patch) | |
| tree | 6ad1de92942ba693a6654f91bcf0898997d37667 /indra/newview/lltexturectrl.cpp | |
| parent | 7f8b63025399978c0921c6bc459df3605c8d86ef (diff) | |
| parent | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (diff) | |
Merge remote repo
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 |