diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
commit | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch) | |
tree | 2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/llui/lltoolbar.cpp | |
parent | 9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff) | |
parent | 1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff) |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rw-r--r-- | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 9b31a6449d..81ea0ebf0c 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -827,7 +827,7 @@ void LLToolBar::draw() // rect may have shifted during layout LLUI::popMatrix(); LLUI::pushMatrix(); - LLUI::translate((F32)getRect().mLeft, (F32)getRect().mBottom, 0.f); + LLUI::translate((F32)getRect().mLeft, (F32)getRect().mBottom); // Position the caret LLIconCtrl* caret = getChild<LLIconCtrl>("caret"); |