diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 11:55:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 11:55:42 -0500 |
| commit | ef794e7ffcfbf672e7115fc91f45f0e8340fdad5 (patch) | |
| tree | 86c967eeb773ae46c191ae3dde1a02a89ca4b1b5 /indra/newview/llfloaterwebcontent.cpp | |
| parent | dfbc6c65f665f5c550581b77aeb7c308181fd8d8 (diff) | |
| parent | 199e65a6c5584dfcdd24d6885dd9b19bf0af953a (diff) | |
merge changes for storm-2015
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 ) { |