diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
| commit | 9ba10bf1f2ee16eb082f4cb29b0b9f7172e7ce8e (patch) | |
| tree | 9548ff32e0a1dc5b3f8a70b2a386827f72bf5284 /indra/newview/llviewerdisplay.cpp | |
| parent | 184bf6a76fd3b52efa83c93f56164d2adce7ed3e (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rwxr-xr-x | indra/newview/llviewerdisplay.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 981e4c40aa..cd9b2ed11b 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1176,8 +1176,8 @@ LLRect get_whole_screen_region() if (zoom_factor > 1.f) { S32 num_horizontal_tiles = llceil(zoom_factor); - S32 tile_width = llround((F32)gViewerWindow->getWorldViewWidthScaled() / zoom_factor); - S32 tile_height = llround((F32)gViewerWindow->getWorldViewHeightScaled() / zoom_factor); + S32 tile_width = ll_round((F32)gViewerWindow->getWorldViewWidthScaled() / zoom_factor); + S32 tile_height = ll_round((F32)gViewerWindow->getWorldViewHeightScaled() / zoom_factor); int tile_y = sub_region / num_horizontal_tiles; int tile_x = sub_region - (tile_y * num_horizontal_tiles); @@ -1471,8 +1471,8 @@ void render_ui_2d() int pos_y = sub_region / llceil(zoom_factor); int pos_x = sub_region - (pos_y*llceil(zoom_factor)); // offset for this tile - LLFontGL::sCurOrigin.mX -= llround((F32)gViewerWindow->getWindowWidthScaled() * (F32)pos_x / zoom_factor); - LLFontGL::sCurOrigin.mY -= llround((F32)gViewerWindow->getWindowHeightScaled() * (F32)pos_y / zoom_factor); + LLFontGL::sCurOrigin.mX -= ll_round((F32)gViewerWindow->getWindowWidthScaled() * (F32)pos_x / zoom_factor); + LLFontGL::sCurOrigin.mY -= ll_round((F32)gViewerWindow->getWindowHeightScaled() * (F32)pos_y / zoom_factor); } stop_glerror(); |