diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-22 18:23:04 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-22 18:23:04 +0200 |
| commit | a7d716c35e57881a016c69752fa5f46dfd314ad9 (patch) | |
| tree | c9f82ce018b1ffe428fab2c289a06d3841f0e8fd /indra/newview/llviewerwindow.cpp | |
| parent | f15151428c16d6358fb22446c0fb626c0e9ad2db (diff) | |
fixed EXT-5418 “When UI scale is set to 1.40 I see notices off the edge of the screen.”,
corrected emitting of world view update signal;
replaced getWorldViewRectRaw with getWorldViewRectScaled LLIMFloater::getAllowedRect;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1669ce6312..1acf114b12 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3008,17 +3008,16 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window) if (mWorldViewRectRaw != new_world_rect) { - LLRect old_world_rect = mWorldViewRectRaw; mWorldViewRectRaw = new_world_rect; gResizeScreenTexture = TRUE; LLViewerCamera::getInstance()->setViewHeightInPixels( mWorldViewRectRaw.getHeight() ); LLViewerCamera::getInstance()->setAspect( getWorldViewAspectRatio() ); + LLRect old_world_rect_scaled = mWorldViewRectScaled; mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale); // sending a signal with a new WorldView rect - old_world_rect = calcScaledRect(old_world_rect, mDisplayScale); - mOnWorldViewRectUpdated(old_world_rect, mWorldViewRectScaled); + mOnWorldViewRectUpdated(old_world_rect_scaled, mWorldViewRectScaled); } } |