aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewermedia.cpp')
-rw-r--r--linden/indra/newview/llviewermedia.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 2ba6b50..c38408d 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -40,7 +40,7 @@
40#include "llviewerimage.h" 40#include "llviewerimage.h"
41#include "llviewerwindow.h" 41#include "llviewerwindow.h"
42#include "llviewerimagelist.h" 42#include "llviewerimagelist.h"
43//#include "viewerversion.h" 43//#include "viewerinfo.h"
44 44
45#include "llpluginclassmedia.h" 45#include "llpluginclassmedia.h"
46 46
@@ -261,7 +261,7 @@ std::string LLViewerMedia::getCurrentUserAgent()
261 std::ostringstream codec; 261 std::ostringstream codec;
262 codec << "SecondLife/"; 262 codec << "SecondLife/";
263 codec << "C64 Basic V2"; 263 codec << "C64 Basic V2";
264 //codec << ViewerVersion::getImpMajorVersion() << "." << ViewerVersion::getImpMinorVersion() << "." << ViewerVersion::getImpPatchVersion() << " " << ViewerVersion::getImpTestVersion(); 264 //codec << " " << ViewerInfo::versionNumbers3();
265 //codec << " (" << channel << "; " << skin_name << " skin)"; 265 //codec << " (" << channel << "; " << skin_name << " skin)";
266// llinfos << codec.str() << llendl; 266// llinfos << codec.str() << llendl;
267 267
@@ -547,6 +547,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
547 547
548 if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"))) 548 if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")))
549 { 549 {
550 #if LL_WINDOWS
551 if (gSavedSettings.getBOOL("ShowConsoleWindow"))
552 {
553 media_source->showConsole();
554 }
555 #endif
556
550 return media_source; 557 return media_source;
551 } 558 }
552 else 559 else