diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-02-14 18:49:33 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-02-14 18:49:33 -0500 |
| commit | acb265a3940f4e06e4a40c0329c47902d305ac73 (patch) | |
| tree | 0d36bcf766f570c4f39837c7ba884889f2ab81ad /indra/newview | |
| parent | 744381956022c74b8617098ab28b52230dfbd0c2 (diff) | |
| parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
Merge. Refresh from viewer-release after 3.7.1 release.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
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 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 ) { |