diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-11 12:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-11 12:54:12 -0500 |
| commit | ee2aebfaf38ca12574b9835340ed8c55c6fbccf2 (patch) | |
| tree | a03a005363255f6c3a6219d629499534bd25a370 /indra/llplugin/llpluginclassmedia.h | |
| parent | 111e915a91ff5431d215312c8659518f5f149555 (diff) | |
| parent | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (diff) | |
merge up to lastest upstream
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); |