diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-24 11:33:41 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-24 11:33:41 -0500 |
| commit | 948c0c559d14b73714652b581886cbcef391ed62 (patch) | |
| tree | 84564c6f7c396e4273e79011ec223e785167420c | |
| parent | 969cb45920c568aeebf145480b7beacb2a157bcf (diff) | |
| parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
merge
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 5 |
3 files changed, 6 insertions, 2 deletions
@@ -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 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 diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 14360d605d..5873fff312 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -373,7 +373,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 ) { |