From ce28e056c20bf2723f565bbf464b87781ec248a2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:42 -0500
Subject: Second Life viewer sources 1.20.2

---
 linden/indra/newview/llviewermedia.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'linden/indra/newview/llviewermedia.cpp')

diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 0429a3c..f318d07 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -44,9 +44,6 @@
 #include "llmediamanager.h"
 #include "lluuid.h"
 
-// don't want to include llappviewer.h
-extern std::string gChannelName;
-
 // Implementation functions not exported into header file
 class LLViewerMediaImpl
 	:	public LLMediaObserver
@@ -456,7 +453,7 @@ void LLViewerMedia::initClass()
 	// append our magic version number string to the browser user agent id
 	std::ostringstream codec;
 	codec << "[Second Life ";
-	codec << "(" << gChannelName << ")";
+	codec << "(" << gSavedSettings.getString("VersionChannelName") << ")";
 	codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
 	codec << "]";
 	init_data->setBrowserUserAgentId( codec.str() );
-- 
cgit v1.1