diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:18:18 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-01 15:18:18 -0700 |
| commit | 6ab2e44e945ddc085a7b4b5f1524de924419a897 (patch) | |
| tree | 37baa5e1439e1612e025dc71a504ecb530145499 /indra/newview/app_settings | |
| parent | be8c9fc21758bcbc1d9f3d565b221310344231bd (diff) | |
VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 3 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 00d69f805e..a17da8e344 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -361,8 +361,7 @@ <map> <key>count</key> <integer>1</integer> - <key>map-to</key> - <string>VersionChannelName</string> + <!-- Special case. Not mapped to a setting. --> </map> <key>loginpage</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 371326c0f5..96d4fb1295 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11344,17 +11344,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>VersionChannelName</key> - <map> - <key>Comment</key> - <string>Versioning Channel Name.</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>Second Life Release</string> - </map> <key>VertexShaderEnable</key> <map> <key>Comment</key> |