diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
commit | b8ac919d6fdf434c4c93ed60e85e14a0711ca4f8 (patch) | |
tree | cb5926d357576b76f6f19f9c54470ece61f45d8f /indra/llplugin/llpluginclassmedia.h | |
parent | ae8c1d1ea87b524797b2986f853745c0a124246c (diff) | |
parent | 7ca1bfc78d91fea8b5c77fec7ac8cb7fa72aee9b (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 6b64688718..b58067733b 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -49,7 +49,7 @@ public: virtual ~LLPluginClassMedia(); // local initialization, called by the media manager when creating a source - virtual bool init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug = false); + virtual bool init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path); // undoes everything init() didm called by the media manager when destroying a source virtual void reset(); |