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/llpluginprocesschild.cpp | |
parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) |
Automated merge from viewer/viewer-2-0
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") { |