diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-30 16:12:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-30 16:12:19 -0400 |
| commit | 4a17569605812f10341bf980e2b4eaaa00ccf1be (patch) | |
| tree | 3954805ba0b7ed8e73dae816b9d3934b13a596f3 /indra/newview | |
| parent | 9d63bb755f8ce8342fdd4be74193f64ad6e71736 (diff) | |
| parent | d0432d4d4cf1a5f3b79327b11566a5f566f35115 (diff) | |
merge changes for CHOP-975
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 209e91d713..8c6f99326c 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2366,8 +2366,6 @@ bool LLAppViewer::initConfiguration() gSavedSettings.setString("ClientSettingsFile", gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); - gSavedSettings.setString("VersionChannelName", LLVersionInfo::getChannel()); - #ifndef LL_RELEASE_FOR_DOWNLOAD // provide developer build only overrides for these control variables that are not // persisted to settings.xml |