diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
| commit | e3b97ac65b10a58c1dac041743e4acd1042492f5 (patch) | |
| tree | 1648189fd15e51ac1c2eb8d8018faa775c93f6d3 /indra/newview/llviewermedia.cpp | |
| parent | b502c86f30d3ed01b795548364ab8090363eeac5 (diff) | |
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f86d822d90..9af072ad6f 100644 --- a/indra/newview/llviewermedia.cpp +++ b/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 @@ -457,7 +454,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() ); |