diff options
| author | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
| commit | 31a109452d743af565f99029ec835e2f32261681 (patch) | |
| tree | 07375d9174730e1deec3aedcc6333fe8426cd827 /indra/newview/llfloaterabout.cpp | |
| parent | b3541777921142572f735c4b028e4fba91ae80a0 (diff) | |
| parent | 2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 135137069c..8ae3ccbae3 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -213,7 +213,7 @@ LLSD LLFloaterAbout::getInfo() info["VIEWER_VERSION_STR"] = LLVersionInfo::getVersion(); info["BUILD_DATE"] = __DATE__; info["BUILD_TIME"] = __TIME__; - info["CHANNEL"] = gSavedSettings.getString("VersionChannelName"); + info["CHANNEL"] = LLVersionInfo::getChannel(); info["VIEWER_RELEASE_NOTES_URL"] = get_viewer_release_notes_url(); @@ -291,7 +291,7 @@ static std::string get_viewer_release_notes_url() std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); if (! LLStringUtil::endsWith(url, "/")) url += "/"; - url += gSavedSettings.getString("VersionChannelName") + "/"; + url += LLVersionInfo::getChannel() + "/"; url += LLVersionInfo::getShortVersion(); return LLWeb::escapeURL(url); } |