Skip to content
Snippets Groups Projects
Commit a5add351 authored by Merov Linden's avatar Merov Linden
Browse files

Pull merge ACME-1317 emergency fix

parents 5c82aca9 8d0f7fe5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloaterwebcontent.cpp
+ 4
− 1
View file @ a5add351
...@@ -387,7 +387,10 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent ...@@ -387,7 +387,10 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
} }
else if(event == MEDIA_EVENT_GEOMETRY_CHANGE) 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 ) else if(event == MEDIA_EVENT_STATUS_TEXT_CHANGED )
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment