diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 09:58:41 -0400 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-30 09:58:41 -0400 |
| commit | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (patch) | |
| tree | 6f6ede75171952788ddd1037b58cc67340eaec74 /indra/newview/lltexturectrl.cpp | |
| parent | 283b862814996dad24ce1e896122465fede118a1 (diff) | |
| parent | 4dd6626c800988f70925d7687f0a4b7bbe20694b (diff) | |
Merge commit.
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 |