diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
| commit | 76cb9a7796ffce930458aae00147f8dafa4b33fb (patch) | |
| tree | c9553396094aba4608da58662e5383c009423d2e /indra/newview/llviewermedia.cpp | |
| parent | b82f2c4e4d8c4b9a349e4cd933dff7a0844019c0 (diff) | |
| parent | 0ea1b472c636415a48b8cc688ec9b7663be6dc9d (diff) | |
STORM-986 : pull into viewer-development
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f16d8814dd..9b02bdbe33 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -53,7 +53,7 @@ #include "llwebsharing.h" // For LLWebSharing::setOpenIDCookie(), *TODO: find a better way to do this! #include "llfilepicker.h" #include "llnotifications.h" - +#include "lldir_win32.h" #include "llevent.h" // LLSimpleListener #include "llnotificationsutil.h" #include "lluuid.h" @@ -1766,7 +1766,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ media_source->setTarget(target); - if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) + const std::string plugin_dir = gDirUtilp->getLLPluginDir(); + if (media_source->init(launcher_name, plugin_dir, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) { return media_source; } |