diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-05-03 17:35:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-05-03 17:35:38 -0700 |
| commit | a14172dd40fa11196950f391e4fc945e432122bf (patch) | |
| tree | 77b35f76528e7ef4f0af2150b40686032707f4d8 /indra/newview/app_settings/settings_minimal.xml | |
| parent | 45145fe7e2b6855b08b2ab94f07e852ef7ffffa3 (diff) | |
| parent | 9120a9bf29f103556c051f65dfb16f303f35cba2 (diff) | |
Sync with viewer-experience
Diffstat (limited to 'indra/newview/app_settings/settings_minimal.xml')
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 2180abdcee..bb022b7b11 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -248,6 +248,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>EnablePlaceProfile</key> + <map> + <key>Comment</key> + <string>Enable viewing of place profile from web link</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>EnablePicks</key> <map> <key>Comment</key> @@ -435,5 +446,16 @@ <key>Value</key> <integer>0</integer> </map> + <key>OpenIMOnVoice</key> + <map> + <key>Comment</key> + <string>Open the corresponding IM window when connecting to a voice call.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> </map> </llsd> |