aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-28 17:02:18 -0700
committerMcCabe Maxsted2009-01-28 17:02:18 -0700
commitedc427a11654d2531d8a8a97c1e461cb13949adc (patch)
tree5ec14cadc6c943179a2b3834b1cedd4755063457 /linden
parentAdded GStreamer to Cmake (diff)
downloadmeta-impy-edc427a11654d2531d8a8a97c1e461cb13949adc.zip
meta-impy-edc427a11654d2531d8a8a97c1e461cb13949adc.tar.gz
meta-impy-edc427a11654d2531d8a8a97c1e461cb13949adc.tar.bz2
meta-impy-edc427a11654d2531d8a8a97c1e461cb13949adc.tar.xz
Plugin path set via string
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llappviewer.cpp9
1 files changed, 3 insertions, 6 deletions
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()
334 { 334 {
335 LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL; 335 LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL;
336 336
337 char plugin_path[255]; 337 std::string plugin_path = "GST_PLUGIN_PATH=" + std::string(buffer) + "\\lib\\gstreamer-plugins";
338 strcpy (plugin_path,"GST_PLUGIN_PATH=");
339 strcat (plugin_path,buffer);
340 strcat (plugin_path,"\\lib\\gstreamer-plugins");
341 338
342 // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe 339 // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
343 putenv(plugin_path); 340 const char* gst_plugin_path = plugin_path.c_str();
344 341 putenv(gst_plugin_path);
345 LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL; 342 LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL;
346 } 343 }
347#endif //LL_WINDOWS 344#endif //LL_WINDOWS