diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/llplugin/llpluginprocessparent.h | |
parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) |
merge changes for storm-937
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; |