diff options
| author | Cho <cho@lindenlab.com> | 2014-02-11 00:09:59 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-02-11 00:09:59 +0000 |
| commit | 8d0f7fe571fad23741c857967d44bcdc57ad731d (patch) | |
| tree | bd11c596258515cace67d27d0b36c1da80f71d59 /indra | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Hack to fix ACME-1317
Diffstat (limited to 'indra')
| -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 ) { |