diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-07 18:39:29 +0300 |
| commit | bb2a0adecaee2f7464caff602473d75c6b65bcaa (patch) | |
| tree | 6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/newview/app_settings | |
| parent | 7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff) | |
| parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 115 |
1 files changed, 2 insertions, 113 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5993eb46fa..8b66cce8a3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1264,17 +1264,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>CertStore</key> - <map> - <key>Comment</key> - <string>Specifies the Certificate Store for certificate trust verification</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>default</string> - </map> <key>ChatBarStealsFocus</key> <map> <key>Comment</key> @@ -1651,17 +1640,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>CurrentGrid</key> - <map> - <key>Comment</key> - <string>Currently Selected Grid</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string></string> - </map> <key>CustomServer</key> <map> <key>Comment</key> @@ -2388,29 +2366,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>DefaultFemaleAvatar</key> - <map> - <key>Comment</key> - <string>Default Female Avatar</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>Female Shape & Outfit</string> - </map> - <key>DefaultMaleAvatar</key> - <map> - <key>Comment</key> - <string>Default Male Avatar</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>Male Shape & Outfit</string> - </map> - <key>DefaultObjectTexture</key> <map> <key>Comment</key> @@ -3487,7 +3442,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>ForceMandatoryUpdate</key> <map> @@ -7741,17 +7696,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>SecondLifeEnterprise</key> - <map> - <key>Comment</key> - <string>Enables Second Life Enterprise features</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>SelectMovableOnly</key> <map> <key>Comment</key> @@ -8556,7 +8500,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>ShowTangentBasis</key> <map> @@ -10449,17 +10393,6 @@ <key>Value</key> <string></string> </map> - <key>VivoxDebugSIPURIHostName</key> - <map> - <key>Comment</key> - <string>Hostname portion of vivox SIP URIs (empty string for the default).</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string></string> - </map> <key>VivoxDebugVoiceAccountServerURI</key> <map> <key>Comment</key> @@ -10471,28 +10404,6 @@ <key>Value</key> <string></string> </map> - <key>VivoxVoiceHost</key> - <map> - <key>Comment</key> - <string>Client SLVoice host to connect to</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>127.0.0.1</string> - </map> - <key>VivoxVoicePort</key> - <map> - <key>Comment</key> - <string>Client SLVoice port to connect to</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>U32</string> - <key>Value</key> - <integer>44125</integer> - </map> <key>VoiceCallsFriendsOnly</key> <map> <key>Comment</key> @@ -10625,17 +10536,6 @@ <key>Value</key> <string>Default</string> </map> - <key>VoiceLogFile</key> - <map> - <key>Comment</key> - <string>Log file to use when launching the voice daemon</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string></string> - </map> <key>VoiceOutputAudioDevice</key> <map> <key>Comment</key> @@ -10680,17 +10580,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>VoiceServerType</key> - <map> - <key>Comment</key> - <string>The type of voice server to connect to.</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>vivox</string> - </map> <key>WLSkyDetail</key> <map> <key>Comment</key> |