diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
| commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
| tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/llui/lltoolbar.cpp | |
| parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
| parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) | |
merge changes for vmrg-225
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"); |