diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-02-24 17:42:16 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-02-24 17:42:16 -0800 |
commit | 52ae219d502d182a7e6c000070e5935b923f30e7 (patch) | |
tree | 556151d5097feb5ae079786044188cb0d0400d16 /indra/llplugin/llpluginclassmedia.h | |
parent | 1c8c28a8de73228c06fdf2d84045433c7231cd19 (diff) | |
parent | 609c70eb5a48389bef1ad33358774764ee9615e2 (diff) |
Merge again lindenlab/viewer-development
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index c826e13c40..618e928a08 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -45,6 +45,7 @@ public: // local initialization, called by the media manager when creating a source virtual bool init(const std::string &launcher_filename, + const std::string &plugin_dir, const std::string &plugin_filename, bool debug); |