Merge branch 'master' into DRTVWR-483

# Conflicts:
#	indra/newview/llviewermenu.cpp

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index df1630255c..1893c9e657 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -69,6 +69,11 @@ public:
 			  const std::string &plugin_filename, 
 			  bool debug);
 
+    // Creates a process
+    // returns true if process already exists or if created,
+    // false if failed to create
+    bool createPluginProcess();
+
 	void idle(void);
 	
 	// returns true if the plugin is on its way to steady state
@@ -163,12 +168,15 @@ private:
 
 	bool accept();
 
+    void clearProcessCreationThread();
+
 	LLSocket::ptr_t mListenSocket;
 	LLSocket::ptr_t mSocket;
 	U32 mBoundPort;
 
 	LLProcess::Params mProcessParams;
 	LLProcessPtr mProcess;
+	LLThread *pProcessCreationThread;
 
 	std::string mPluginFile;
 	std::string mPluginDir;