diff options
author | callum <none@none> | 2010-12-17 16:20:19 -0800 |
---|---|---|
committer | callum <none@none> | 2010-12-17 16:20:19 -0800 |
commit | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (patch) | |
tree | 41431c4e4e0d705f5486107898acf818f446b4a3 /indra/newview/llviewermedia.cpp | |
parent | 0af2c1a48261c301a1f030eb092e4a23674ee8b6 (diff) |
SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window position parameters in
Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 93c0985557..dacd663f83 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -63,6 +63,7 @@ #include "llwindow.h" #include "llfloatermediabrowser.h" // for handling window close requests and geometry change requests in media browser windows. +#include "llfloaterwebcontent.h" // for handling window close requests and geometry change requests in media browser windows. #include <boost/bind.hpp> // for SkinFolder listener #include <boost/signals2.hpp> @@ -3127,6 +3128,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla // This close request is directed at another instance pass_through = false; LLFloaterMediaBrowser::closeRequest(uuid); + LLFloaterWebContent::closeRequest(uuid); } } break; @@ -3146,6 +3148,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla // This request is directed at another instance pass_through = false; LLFloaterMediaBrowser::geometryChanged(uuid, plugin->getGeometryX(), plugin->getGeometryY(), plugin->getGeometryWidth(), plugin->getGeometryHeight()); + LLFloaterWebContent::geometryChanged(uuid, plugin->getGeometryX(), plugin->getGeometryY(), plugin->getGeometryWidth(), plugin->getGeometryHeight()); } } break; |