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/llpluginprocesschild.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/llpluginprocesschild.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 52b5a319ec..9b43ec0e3e 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -156,6 +156,7 @@ void LLPluginProcessChild::idle(void) setState(STATE_PLUGIN_INITIALIZING); LLPluginMessage message("base", "init"); message.setValue("user_data_path", mUserDataPath); + message.setValue("language_code", mLanguageCode); sendMessageToPlugin(message); } break; @@ -329,6 +330,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) { mPluginFile = parsed.getValue("file"); mUserDataPath = parsed.getValue("user_data_path"); + mLanguageCode = parsed.getValue("language_code"); } else if(message_name == "shm_add") { |