diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llvelocitybar.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvelocitybar.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/linden/indra/newview/llvelocitybar.cpp b/linden/indra/newview/llvelocitybar.cpp index eacfd78..1794616 100644 --- a/linden/indra/newview/llvelocitybar.cpp +++ b/linden/indra/newview/llvelocitybar.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -111,30 +112,30 @@ void LLVelocityBar::draw() | |||
111 | left = 0; | 112 | left = 0; |
112 | std::string str; | 113 | std::string str; |
113 | str = llformat( "Velocity %.3fm/s", velocity); | 114 | str = llformat( "Velocity %.3fm/s", velocity); |
114 | LLFontGL::sMonospace->renderUTF8(str, 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 115 | LLFontGL::getFontMonospace()->renderUTF8(str, 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
115 | 116 | ||
116 | top = TICK_BOTTOM; | 117 | top = TICK_BOTTOM; |
117 | 118 | ||
118 | left = - MAGIC_CHAR_WIDTH/2; | 119 | left = - MAGIC_CHAR_WIDTH/2; |
119 | LLFontGL::sMonospace->renderUTF8(std::string("0"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 120 | LLFontGL::getFontMonospace()->renderUTF8(std::string("0"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
120 | 121 | ||
121 | left = (getRect().getWidth()*1 / 6) - MAGIC_CHAR_WIDTH * 2; | 122 | left = (getRect().getWidth()*1 / 6) - MAGIC_CHAR_WIDTH * 2; |
122 | LLFontGL::sMonospace->renderUTF8(std::string("1"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 123 | LLFontGL::getFontMonospace()->renderUTF8(std::string("1"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
123 | 124 | ||
124 | left = (getRect().getWidth()*2 / 6) - MAGIC_CHAR_WIDTH; | 125 | left = (getRect().getWidth()*2 / 6) - MAGIC_CHAR_WIDTH; |
125 | LLFontGL::sMonospace->renderUTF8(std::string("2"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 126 | LLFontGL::getFontMonospace()->renderUTF8(std::string("2"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
126 | 127 | ||
127 | left = (getRect().getWidth()*3 / 6) - MAGIC_CHAR_WIDTH * 2; | 128 | left = (getRect().getWidth()*3 / 6) - MAGIC_CHAR_WIDTH * 2; |
128 | LLFontGL::sMonospace->renderUTF8(std::string("3"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 129 | LLFontGL::getFontMonospace()->renderUTF8(std::string("3"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
129 | 130 | ||
130 | left = (getRect().getWidth()*4 / 6) - MAGIC_CHAR_WIDTH; | 131 | left = (getRect().getWidth()*4 / 6) - MAGIC_CHAR_WIDTH; |
131 | LLFontGL::sMonospace->renderUTF8(std::string("4"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 132 | LLFontGL::getFontMonospace()->renderUTF8(std::string("4"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
132 | 133 | ||
133 | left = (getRect().getWidth()*5 / 6) - MAGIC_CHAR_WIDTH * 2; | 134 | left = (getRect().getWidth()*5 / 6) - MAGIC_CHAR_WIDTH * 2; |
134 | LLFontGL::sMonospace->renderUTF8(std::string("5"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 135 | LLFontGL::getFontMonospace()->renderUTF8(std::string("5"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
135 | 136 | ||
136 | left = (getRect().getWidth()*6 / 6) - MAGIC_CHAR_WIDTH * 3; | 137 | left = (getRect().getWidth()*6 / 6) - MAGIC_CHAR_WIDTH * 3; |
137 | LLFontGL::sMonospace->renderUTF8(std::string("6 m/s"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); | 138 | LLFontGL::getFontMonospace()->renderUTF8(std::string("6 m/s"), 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP); |
138 | 139 | ||
139 | // draw idle time | 140 | // draw idle time |
140 | top = BAR_TOP; | 141 | top = BAR_TOP; |