From 314961674a508c7d13cc889d914b0ded99376f9b Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 29 Apr 2011 15:52:48 -0700 Subject: EXP-769 Group call requests received in Basic mode --- indra/newview/app_settings/settings.xml | 6 +++--- indra/newview/app_settings/settings_minimal.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f2a0e5ac19..b95c83e1ac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11662,10 +11662,10 @@ Value 0 - VoiceCallsRejectAll + VoiceCallsRejectGroup Comment - Silently reject all incoming voice calls. + Silently reject all incoming group voice calls. Persist 1 Type @@ -11673,7 +11673,7 @@ Value 0 - VoiceDisableMic + VoiceDisableMic Comment Completely disable the ability to open the mic. diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 60aecb279c..3d470b27c1 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -117,14 +117,14 @@ Value 0 - VoiceCallsRejectAll + VoiceCallsRejectGroup Comment - Silently reject all incoming voice calls. + Silently reject all incoming group voice calls. Type Boolean Value - 0 + 1 VoiceDisableMic -- cgit v1.2.3 From b0ebba414e2b2924b1fb9e238a000408fd5358f8 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 3 May 2011 10:43:32 -0700 Subject: merge fix for voice --- indra/newview/app_settings/settings_minimal.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index f2816c28f3..2180abdcee 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -52,7 +52,7 @@ Type Boolean Value - 0 + 1 HelpURLFormat @@ -124,7 +124,7 @@ Type Boolean Value - 1 + 0 VoiceDisableMic @@ -133,7 +133,7 @@ Type Boolean Value - 1 + 0 ScriptsCanShowUI @@ -290,7 +290,7 @@ Type Boolean Value - 0 + 1 EnableAvatarShare -- cgit v1.2.3 From 8cc430f691fe65cd03cbac1c4246d836000babd1 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 3 May 2011 17:11:58 -0700 Subject: EXP-624 Place profile floater may be opened by SLApp --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6b56da5edd..a9eb45b14c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12546,6 +12546,17 @@ Boolean Value 1 + + EnablePlaceProfile + + Comment + Enable viewing of place profile from web link + Persist + 1 + Type + Boolean + Value + 1 EnablePicks diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 2180abdcee..1e9c3f54fd 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -248,6 +248,17 @@ Value 0 + EnablePlaceProfile + + Comment + Enable viewing of place profile from web link + Persist + 1 + Type + Boolean + Value + 0 + EnablePicks Comment -- cgit v1.2.3 From 950b74c1705cc7d72c5f05fd707ba230b00027f0 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Tue, 3 May 2011 17:12:43 -0700 Subject: EXP-778 Bring up corresponding IM window on connect to new voice call. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a9eb45b14c..f83aa20e10 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12723,5 +12723,16 @@ Value 0 + OpenIMOnVoice + + Comment + Open the corresponding IM window when connecting to a voice call. + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 1e9c3f54fd..bb022b7b11 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -446,5 +446,16 @@ Value 0 + OpenIMOnVoice + + Comment + Open the corresponding IM window when connecting to a voice call. + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From f0d095086ff5bf2c231bee06064a89a8b6ef4a9b Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 5 May 2011 19:09:06 -0700 Subject: EXP-501 FIX View button on bottom bar is hidden when launching Basic Viewer... ignore button reordering in basic mode use preferred button collapse order --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f83aa20e10..ac52cff49a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12734,5 +12734,16 @@ Value 0 + AllowBottomTrayButtonReordering + + Comment + Allow user to move and hide bottom tray buttons + Persist + 1 + Type + Boolean + Value + 1 + diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index bb022b7b11..9c6418b1f0 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -457,5 +457,16 @@ Value 1 + AllowBottomTrayButtonReordering + + Comment + Allow user to move and hide bottom tray buttons + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 6 May 2011 13:36:08 -0700 Subject: EXP-769: "Group call requests received in Basic mode" fixing merge error --- indra/newview/app_settings/settings_minimal.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 9c6418b1f0..d3f0ec5dad 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -124,7 +124,7 @@ Type Boolean Value - 0 + 1 VoiceDisableMic -- cgit v1.2.3