diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-02-26 14:04:43 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-02-26 14:04:43 -0800 |
| commit | fa88239bd00fcb6d58f20a0c23699f108acbfcbc (patch) | |
| tree | ed978c9dedf1905f5b0f6b2d2346600fd6e48ff3 /indra/newview/llfloaterwebcontent.cpp | |
| parent | 95523616b89dadd697eb6cfa3a466feadc1e1208 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Merge with 3.7.2-release
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 ) { |