diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-02 09:54:52 -0800 |
| commit | 9ed8b5299f2e5a8a912649e0e6aecaf89b034408 (patch) | |
| tree | e7c9ecc91fbbef0c26fd352f2743ac050d8f889e /indra/newview/lltexturectrl.cpp | |
| parent | 55731ee318e6e3c2e9998c6347cbd9d3635115c4 (diff) | |
| parent | 3783852444825edf420e6109927df21fd004c3e7 (diff) | |
Merge from 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 |