diff options
| author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
| commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
| tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
| parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) | |
Merge viewer 2-0 into media
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") { |