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/lltexturectrl.cpp | |
| parent | b4bd34bd73b2be74afd08785c88b66b2fadd5bfc (diff) | |
| parent | 07647fdc5e02f893905d40af00e9ad4ffbc4ae5a (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 |