diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-12 14:34:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-12 14:34:25 -0800 |
| commit | d5e685306ce100a62db06a36dfef58f3beb22b7a (patch) | |
| tree | 4edf13210302a08dd6da9f2bdf3f0218d9734c5a /indra/llplugin/llpluginprocessparent.cpp | |
| parent | 6079a50186923cd764474e94d70da89074d0a7ab (diff) | |
(for B5) Fix for EXT-5823 "Include language in user-agent string" (implemented via JavaScript - not in ua string)
(for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry"
Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index efd5df687e..0ce2c759ba 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -98,13 +98,14 @@ void LLPluginProcessParent::errorState(void) setState(STATE_ERROR); } -void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path) +void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path, const std::string &language_code) { mProcess.setExecutable(launcher_filename); mPluginFile = plugin_filename; mCPUUsage = 0.0f; mDebug = debug; mUserDataPath = user_data_path; + mLanguageCode = language_code; setState(STATE_INITIALIZED); } @@ -363,6 +364,7 @@ void LLPluginProcessParent::idle(void) LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin"); message.setValue("file", mPluginFile); message.setValue("user_data_path", mUserDataPath); + message.setValue("language_code", mLanguageCode); sendMessage(message); } |