diff options
author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/llui/lltoolbar.cpp | |
parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) |
Automated merge with http://hg.secondlife.com/viewer-release
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"); |