From 8d0f7fe571fad23741c857967d44bcdc57ad731d Mon Sep 17 00:00:00 2001 From: Cho Date: Tue, 11 Feb 2014 00:09:59 +0000 Subject: Hack to fix ACME-1317 --- indra/newview/llfloaterwebcontent.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 76b73fcf29..68dbb5ae33 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -372,7 +372,10 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent } else if(event == MEDIA_EVENT_GEOMETRY_CHANGE) { - geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight()); + if (mCurrentURL.find("facebook.com/dialog/oauth") == std::string::npos) // HACK to fix ACME-1317 - Cho + { + geometryChanged(self->getGeometryX(), self->getGeometryY(), self->getGeometryWidth(), self->getGeometryHeight()); + } } else if(event == MEDIA_EVENT_STATUS_TEXT_CHANGED ) { -- cgit v1.2.3 From cb9e53414dd3fc667c5ad8d2b5b772b1f1eaa2bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 14 Feb 2014 16:00:45 -0500 Subject: Added tag 3.7.1-release for changeset dcb4981ce255 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4873c148a5..ab6fe3635b 100755 --- a/.hgtags +++ b/.hgtags @@ -473,3 +473,4 @@ d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release 88bbfd7a6971033f3aa103f3a3500ceb4c73521b 3.6.12-release 0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release 5d746de933a98ca17887cde2fece80e9c7ab0b98 3.7.0-release +dcb4981ce255841b6083d8f65444b65d5a733a17 3.7.1-release -- cgit v1.2.3 From ce7e19d33a74e89059c2196da9c439d0eb9b21c1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 14 Feb 2014 16:00:45 -0500 Subject: increment viewer version to 3.7.2 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index a76ccff2a6..0b2eb36f50 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.1 +3.7.2 -- cgit v1.2.3