diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-12 17:07:22 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-12 17:07:22 -0800 |
| commit | 063ea9ad22108d231349e24c273e853bc60ea5b7 (patch) | |
| tree | 90ef890735c1fdc168d193d78966be54ae3c00f6 /indra | |
| parent | 2887d191ebd8bd9fff2a163e8b20acdeb4a82b5a (diff) | |
| parent | a5add351e891fb4e49c8014851b1dfff8657ff07 (diff) | |
Pull merge
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 4151eec3e3..8830accbf2 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -387,7 +387,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 ) { |