diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 18:52:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 18:52:15 -0500 |
| commit | 65ca5968cd59663c3567287c14ce506e37c085c4 (patch) | |
| tree | b74325f43d5757fdab1ce607b4f6aff94529e7b3 /indra/llplugin/llpluginprocessparent.h | |
| parent | 49e28d324066add8cca44e27806b8077d3b0c542 (diff) | |
| parent | cba34d7d4cdb0339113a4798965d595645d5cb49 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 32394809ef..c66723f175 100644 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -57,6 +57,7 @@ public: ~LLPluginProcessParent(); void init(const std::string &launcher_filename, + const std::string &plugin_dir, const std::string &plugin_filename, bool debug); @@ -151,6 +152,7 @@ private: LLProcessLauncher mProcess; std::string mPluginFile; + std::string mPluginDir; LLPluginProcessParentOwner *mOwner; |