summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginprocessparent.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-17 15:02:09 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-17 15:02:09 +0200
commit082e9b2d414114301b22320858dca838c2d31f27 (patch)
tree1654d69e483252c9c4d12e1012800de4740510e2 /indra/llplugin/llpluginprocessparent.h
parent5cae8140f4dfbdd9c4b3237a0d47248753180913 (diff)
parent59e4b000a3ed41a3c83ae99501adc3eccf64367e (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llplugin/llpluginprocessparent.h')
-rw-r--r--indra/llplugin/llpluginprocessparent.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 23702814c8..cc6c513615 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -61,9 +61,7 @@ public:
void init(const std::string &launcher_filename,
const std::string &plugin_filename,
- bool debug,
- const std::string &user_data_path,
- const std::string &language_code);
+ bool debug);
void idle(void);
@@ -148,9 +146,6 @@ private:
std::string mPluginFile;
- std::string mUserDataPath;
- std::string mLanguageCode;
-
LLPluginProcessParentOwner *mOwner;
typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;