From a7d716c35e57881a016c69752fa5f46dfd314ad9 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Mon, 22 Feb 2010 18:23:04 +0200 Subject: =?UTF-8?q?fixed=20EXT-5418=20=E2=80=9CWhen=20UI=20scale=20is=20se?= =?UTF-8?q?t=20to=201.40=20I=20see=20notices=20off=20the=20edge=20of=20the?= =?UTF-8?q?=20screen.=E2=80=9D,=20corrected=20emitting=20of=20world=20view?= =?UTF-8?q?=20update=20signal;=20replaced=20getWorldViewRectRaw=20with=20g?= =?UTF-8?q?etWorldViewRectScaled=20LLIMFloater::getAllowedRect;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llviewerwindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewerwindow.cpp') 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); } } -- cgit v1.2.3 From 16b284971ebb6ecb41ba65d5fd9da87bc08bcba3 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 22 Feb 2010 19:22:43 +0200 Subject: Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid slurls). - Added new static method LLSLURL::isValidSLURL() whic uses LLUrlRegistry::isUrl() to validate SLURLs and not just chek prefixes as LLSLURL::isSLURL() does. - Used it in slurl DnD check in LLViewerWindow. - LLUrlEntrySLURL regexp was changed not to pass non-valid SLURLS (such as one from the bug description). --HG-- branch : product-engine --- indra/newview/llviewerwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llviewerwindow.cpp') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1acf114b12..591b1de509 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -826,6 +826,8 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi if (slurl_dnd_enabled) { + // isValidSLURL() call was added here to make sure that dragged SLURL is valid (EXT-4964) + if ( LLSLURL::isSLURL( data ) && LLSLURL::isValidSLURL( data ) ) // special case SLURLs if ( LLSLURL::isSLURL( data ) ) { -- cgit v1.2.3 From 79b6eea163d4426e20ad1e71bb31805fbfe67fee Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 22 Feb 2010 20:01:44 +0200 Subject: No ticket. Removed unnecessary string which was occasionally left in 5e7ce89a4c9e. --HG-- branch : product-engine --- indra/newview/llviewerwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerwindow.cpp') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 591b1de509..eba6463d84 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -826,10 +826,10 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi if (slurl_dnd_enabled) { + + // special case SLURLs // isValidSLURL() call was added here to make sure that dragged SLURL is valid (EXT-4964) if ( LLSLURL::isSLURL( data ) && LLSLURL::isValidSLURL( data ) ) - // special case SLURLs - if ( LLSLURL::isSLURL( data ) ) { if (drop) { -- cgit v1.2.3