From edc427a11654d2531d8a8a97c1e461cb13949adc Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 28 Jan 2009 17:02:18 -0700 Subject: Plugin path set via string --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llappviewer.cpp | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index db2b715..3ccf1b3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,6 +2,12 @@ =- 1.1.0 -= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +2009-01-27 McCabe Maxsted + + * linden/indra/newview/llappviewer.cpp: + Plugin path set via string. + + 2009-01-26 McCabe Maxsted * linden/indra/cmake/CopyWinLibs.cmake: diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index acc512f..15ce1a3 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -334,14 +334,11 @@ void LLAppViewer::gst_plugin_path() { LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL; - char plugin_path[255]; - strcpy (plugin_path,"GST_PLUGIN_PATH="); - strcat (plugin_path,buffer); - strcat (plugin_path,"\\lib\\gstreamer-plugins"); + std::string plugin_path = "GST_PLUGIN_PATH=" + std::string(buffer) + "\\lib\\gstreamer-plugins"; // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe - putenv(plugin_path); - + const char* gst_plugin_path = plugin_path.c_str(); + putenv(gst_plugin_path); LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL; } #endif //LL_WINDOWS -- cgit v1.1