diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 14:36:52 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 14:36:52 -0800 |
| commit | ca2566a1aca90bc2cc54c96d94bcd85110e65bed (patch) | |
| tree | 20ee8031d73da630e8b967fa1760ffab702ccedd /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 6dd56fddd7c84e5bbf7c80ea556b0a694c3823da (diff) | |
| parent | 05e0d9d24ac4ec1c0b18326e97a0c9ab705f5948 (diff) | |
Merge
Diffstat (limited to 'indra/llplugin/llpluginprocesschild.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 55cf11c620..ccf6dab942 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -145,8 +145,12 @@ void LLPluginProcessChild::idle(void) break; case STATE_PLUGIN_LOADED: - setState(STATE_PLUGIN_INITIALIZING); - sendMessageToPlugin(LLPluginMessage("base", "init")); + { + setState(STATE_PLUGIN_INITIALIZING); + LLPluginMessage message("base", "init"); + message.setValue("user_data_path", mUserDataPath); + sendMessageToPlugin(message); + } break; case STATE_PLUGIN_INITIALIZING: @@ -310,6 +314,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) if(message_name == "load_plugin") { mPluginFile = parsed.getValue("file"); + mUserDataPath = parsed.getValue("user_data_path"); } else if(message_name == "shm_add") { |