automated merge viewer2.0->viewe2.0

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 524cd9923f..23702814c8 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -59,7 +59,12 @@ public:
 	LLPluginProcessParent(LLPluginProcessParentOwner *owner);
 	~LLPluginProcessParent();
 		
-	void init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path);
+	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);
+
 	void idle(void);
 	
 	// returns true if the plugin is on its way to steady state
@@ -144,6 +149,7 @@ private:
 	std::string mPluginFile;
 
 	std::string mUserDataPath;
+	std::string mLanguageCode;
 
 	LLPluginProcessParentOwner *mOwner;