From 7e6ce12a17add531695d0435e85a9e5564209e41 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 8 Feb 2011 15:37:12 -0800
Subject: VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins
 if the current working Reviewed by Richard -
 http://codereview.lindenlab.com/6011001/

---
 indra/llplugin/llpluginprocessparent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llplugin/llpluginprocessparent.cpp')

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index c002de0462..db4b8b1316 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -157,10 +157,11 @@ void LLPluginProcessParent::errorState(void)
 		setState(STATE_ERROR);
 }
 
-void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug)
+void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug)
 {	
 	mProcess.setExecutable(launcher_filename);
 	mPluginFile = plugin_filename;
+	mPluginDir = plugin_dir;
 	mCPUUsage = 0.0f;
 	mDebug = debug;	
 	setState(STATE_INITIALIZED);
@@ -445,6 +446,7 @@ void LLPluginProcessParent::idle(void)
 				{
 					LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin");
 					message.setValue("file", mPluginFile);
+					message.setValue("dir", mPluginDir);
 					sendMessage(message);
 				}
 
-- 
cgit v1.2.3


From 11a0785cebcbbcf89eab90c7f2a4c0b7c538736c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 15:03:26 -0800
Subject: SOCIAL-595 FIX Global Volume control does not affect volume of MOAP
 in minimal skin on Windows made slplugin.exe start with correct working
 directory (llplugin)

---
 indra/llplugin/llpluginprocessparent.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llplugin/llpluginprocessparent.cpp')

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index db4b8b1316..315096d4fd 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -160,6 +160,7 @@ void LLPluginProcessParent::errorState(void)
 void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug)
 {	
 	mProcess.setExecutable(launcher_filename);
+	mProcess.setWorkingDirectory(plugin_dir);
 	mPluginFile = plugin_filename;
 	mPluginDir = plugin_dir;
 	mCPUUsage = 0.0f;
-- 
cgit v1.2.3