aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llappviewer.cpp9
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 @@
2=- 1.1.0 -= 2=- 1.1.0 -=
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4 4
52009-01-27 McCabe Maxsted <hakushakukun@gmail.com>
6
7 * linden/indra/newview/llappviewer.cpp:
8 Plugin path set via string.
9
10
52009-01-26 McCabe Maxsted <hakushakukun@gmail.com> 112009-01-26 McCabe Maxsted <hakushakukun@gmail.com>
6 12
7 * linden/indra/cmake/CopyWinLibs.cmake: 13 * 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()
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