diff options
| author | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
| commit | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch) | |
| tree | 9da9b08465582432d12797951543a30d6c9fc2c1 /indra/newview/llfloaterwebcontent.cpp | |
| parent | 672cc7049777b57a01a61428864ac6e3d10df321 (diff) | |
| parent | a5e56067c28298b4df0ef498303f78f67c35782c (diff) | |
STORM-68 merge
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 ) { |