diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/llplugin/llpluginclassmedia.h | |
parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) |
Automated merge from viewer/viewer-2-0
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 58e91fa0b4..ce49241e84 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -49,7 +49,11 @@ 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, const std::string &user_data_path); + virtual bool init(const std::string &launcher_filename, + const std::string &plugin_filename, + bool debug, + const std::string &user_data_path, + const std::string &language_code); // undoes everything init() didm called by the media manager when destroying a source virtual void reset(); |