From 2474385a2a447a9e9d05bb170c6f7a4be8d43249 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Feb 2013 11:19:51 +0100 Subject: STORM-1931: Added option to disable chat animations (say/whisper/shout) --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 79376f7467..6436f11967 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6845,6 +6845,17 @@ Value 90.0 + PlayChatAnim + + Comment + Your avatar plays the chat animation whenever you say, shout or whisper something in nearby chat + Persist + 1 + Type + Boolean + Value + 1 + PlayTypingAnim Comment -- cgit v1.2.3 From 61f49cdee48de0d5fa6cda7080bcfce0b449f115 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 22 Mar 2013 09:57:52 -0400 Subject: correct validity errors in llsd files --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/app_settings/settings_minimal.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e91d10cd3..a9a6707a54 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10853,7 +10853,7 @@ Type F32 Value - 0.0 + 0.0 TextureFetchUpdateSkipLowPriority diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 01a70f2671..863b5b0435 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -1 +1,2 @@ - \ No newline at end of file + + -- cgit v1.2.3 From 697bb80968e1fc539a023284ad5135e15d38d150 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 22 Mar 2013 09:57:52 -0400 Subject: correct validity errors in llsd files --- indra/newview/app_settings/settings.xml | 3 ++- indra/newview/app_settings/settings_minimal.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e91d10cd3..b2c0b030b0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10853,7 +10853,7 @@ Type F32 Value - 0.0 + 0.0 TextureFetchUpdateSkipLowPriority @@ -12492,6 +12492,7 @@ Type LLSD Value + VFSOldSize diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 01a70f2671..e660c1a33b 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -1 +1,4 @@ - \ No newline at end of file + + + + -- cgit v1.2.3 From 03ad10d258095487d6ae8f26634932bc832f10df Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 18 Apr 2013 19:46:08 -0700 Subject: CHUI-849 : WIP : Filter limit on time instead of number of items --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4c305e1d60..a28c6366c0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3402,6 +3402,17 @@ Value 500 + FilterItemsMaxTimePerFrame + + Comment + Max time devoted to items filtering per frame (in milliseconds) + Persist + 1 + Type + S32 + Value + 100 + FindLandArea Comment -- cgit v1.2.3 From 2cc1fb250f78df3a4b8f33b13b30defef7efb78a Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 19 Apr 2013 16:51:44 -0700 Subject: CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists --- indra/newview/app_settings/settings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a28c6366c0..cd2b15ef2b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3391,27 +3391,27 @@ Value 10.0 - FilterItemsPerFrame + FilterItemsMaxTimePerFrameVisible - Comment - Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed) - Persist - 1 - Type - S32 - Value - 500 + Comment + Max time devoted to items filtering per frame for visible inventory listings (in milliseconds) + Persist + 1 + Type + S32 + Value + 10 - FilterItemsMaxTimePerFrame + FilterItemsMaxTimePerFrameUnvisible Comment - Max time devoted to items filtering per frame (in milliseconds) + Max time devoted to items filtering per frame for non visible inventory listings (in milliseconds) Persist 1 Type S32 Value - 100 + 1 FindLandArea -- cgit v1.2.3 From 3187ee18e1fa5a8b3f719f26f32b01b817791a4e Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Wed, 15 May 2013 20:31:47 +0300 Subject: CHUI-945 FIXED Add Object IMs to Chat Notification Preferences --- indra/newview/app_settings/settings.xml | 105 ++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 03135caf93..5f1348e3c5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6398,7 +6398,10 @@ NotificationConferenceIMOptions Comment - Specifies how the UI responds to Conference IM Notifications. + + Specifies how the UI responds to Conference IM Notifications. + Allowed values: [openconversations,toast,flash,noaction] + Persist 1 Type @@ -6409,7 +6412,10 @@ NotificationFriendIMOptions Comment - Specifies how the UI responds to Friend IM Notifications. + + Specifies how the UI responds to Friend IM Notifications. + Allowed values: [openconversations,toast,flash,noaction] + Persist 1 Type @@ -6420,7 +6426,10 @@ NotificationGroupChatOptions Comment - Specifies how the UI responds to Group Chat Notifications. + + Specifies how the UI responds to Group Chat Notifications. + Allowed values: [openconversations,toast,flash,noaction] + Persist 1 Type @@ -6431,7 +6440,10 @@ NotificationNearbyChatOptions Comment - Specifies how the UI responds to Nearby Chat Notifications. + + Specifies how the UI responds to Nearby Chat Notifications. + Allowed values: [openconversations,toast,flash,noaction] + Persist 1 Type @@ -6442,7 +6454,10 @@ NotificationNonFriendIMOptions Comment - Specifies how the UI responds to Non Friend IM Notifications. + + Specifies how the UI responds to Non Friend IM Notifications. + Allowed values: [openconversations,toast,flash,noaction] + Persist 1 Type @@ -6450,6 +6465,20 @@ Value toast + NotificationObjectIMOptions + + Comment + + Specifies how the UI responds to Object IM Notifications. + Allowed values: [openconversations,toast,flash,noaction] + + Persist + 1 + Type + String + Value + noaction + NotificationToastLifeTime Comment @@ -6988,6 +7017,72 @@ Value 0 + PlaySoundFriendIM + + Comment + Plays a sound when friend's IM received. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundNonFriendIM + + Comment + Plays a sound when non-friend's IM received. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundConferenceIM + + Comment + Plays a sound when conference IM received. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundGroupChatIM + + Comment + Plays a sound when group chat IM received. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundNearbyChatIM + + Comment + Plays a sound when nearby chat IM received. + Persist + 1 + Type + Boolean + Value + 0 + + PlaySoundObjectIM + + Comment + Plays a sound when IM fom an object received. + Persist + 1 + Type + Boolean + Value + 0 + PlaySoundNewConversation Comment -- cgit v1.2.3 From bad8c183fe1e0f29685e7d648551effebfb096d9 Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Thu, 6 Jun 2013 15:15:33 +0300 Subject: CHUI-945 ADD FIX Add Object IMs to Chat Notification Preferences --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 411e5f9005..313eb550fd 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6499,7 +6499,7 @@ Type String Value - noaction + toast NotificationToastLifeTime -- cgit v1.2.3 From d5febe1ab553749808198ec4e0c78ec64d4d9588 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Jun 2013 11:07:12 -0400 Subject: CHOP-956: Add settings_install.xml to settings_files.xml. Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml. --- indra/newview/app_settings/settings_files.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml index bfc09286e3..4a9e522a96 100755 --- a/indra/newview/app_settings/settings_files.xml +++ b/indra/newview/app_settings/settings_files.xml @@ -4,6 +4,9 @@ + -- cgit v1.2.3 From 4a9b688b4d46f67e1b00e04ebe972470b61e560a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 27 Jun 2013 16:11:48 -0400 Subject: CHOP-959: Make settings.xml actually valid XML LLSD. UserLoginInfo block had Value without the required subsequent element to provide any actual value. This confused at least the Python LLSD reader. --- indra/newview/app_settings/settings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 12ca902c59..997bde37ce 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12859,12 +12859,13 @@ UserLoginInfo Comment - Users loging data. + User login data. Persist 1 Type LLSD Value + VFSOldSize -- cgit v1.2.3 From c08b60ac6fee74f613ed3f5f8702291ed1c2376f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 28 Jun 2013 15:26:18 -0400 Subject: CHOP-959: Streamline processing for --graphicslevel switch. Use map-to in cmd_line.xml to inform the command-line processor that the target variable for --graphicslevel is RenderQualityPerformance. That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc. Moreover, previous switch statement only accepted 0 - 3, whereas LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce LLFeatureManager::isValidGraphicsLevel() and use that to validate. Replace switch statement in setGraphicsLevel() mapping int constants to string literals with static vector of level names, using same data for mapping as for validating level numbers. --- indra/newview/app_settings/cmd_line.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 7ab7787d77..8ca33fbf54 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -96,6 +96,8 @@ 0 - low, 1 - medium, 2 - high, 3 - ultra count 1 + map-to + RenderQualityPerformance grid -- cgit v1.2.3 From 3d9c74dcc869d7ce3708426a0b45bfb838529d3f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 1 Jul 2013 16:19:24 -0400 Subject: CHOP-959: Introduce and use settings vars for some cmd_line switches. The cmd_line.xml entries: analyzeperformance crashonstartup debugsession disablecrashlogger logmetrics logperformance noquicktime replaysession all specify map-to settings.xml variables -- none of which existed! Introduce such variables. Instead of detecting the presence of a particular switch in the command-line parser, use the value of its corresponding settings variable. --- indra/newview/app_settings/settings.xml | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 997bde37ce..a39b447cca 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -126,6 +126,17 @@ Value 1 + AnalyzePerformance + + Comment + Request performance analysis for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + AnimateTextures Comment @@ -1916,6 +1927,17 @@ Value 262144 + CrashOnStartup + + Comment + User-requested crash on viewer startup + Persist + 0 + Type + Boolean + Value + 0 + CreateToolCopyCenters Comment @@ -2158,6 +2180,17 @@ Value 0 + DebugSession + + Comment + Request debugging for a particular viewer session + Persist + 0 + Type + Boolean + Value + 0 + DebugShowColor Comment @@ -2972,6 +3005,17 @@ Value 0 + DisableCrashLogger + + Comment + Do not send crash report to Linden server + Persist + 0 + Type + Boolean + Value + 0 + DisableMouseWarp Comment @@ -5217,6 +5261,28 @@ Value 0 + LogMetrics + + Comment + Log viewer metrics + Persist + 0 + Type + String + Value + + + LogPerformance + + Comment + Log performance analysis for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + LogTextureNetworkTraffic Comment @@ -6394,6 +6460,17 @@ Value 0 + NoQuickTime + + Comment + Disable QuickTime for a particular viewer run + Persist + 0 + Type + Boolean + Value + 0 + NoVerifySSLCert Comment @@ -9643,6 +9720,17 @@ Value 1 + ReplaySession + + Comment + Request replay of previously-recorded pilot file + Persist + 0 + Type + Boolean + Value + 0 + RotateRight Comment -- cgit v1.2.3 From 09d8d17382c72b7741fde1334e832f39d773299f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Jul 2013 15:30:49 -0400 Subject: CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl. Route --url and --slurl command-line switches through a common settings variable. Treat them uniformly now. (Previously, passing --url would notice a grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.) --- indra/newview/app_settings/cmd_line.xml | 6 ++++-- indra/newview/app_settings/settings.xml | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 8ca33fbf54..71a052057c 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -372,7 +372,8 @@ true last_option true - + map-to + CmdLineLoginLocation url @@ -383,7 +384,8 @@ 1 last_option true - + map-to + CmdLineLoginLocation usersessionsettings diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a39b447cca..8a50ca146b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1795,6 +1795,17 @@ + CmdLineLoginLocation + + Comment + Startup destination requested on command line + Persist + 0 + Type + String + Value + + ConnectAsGod Comment -- cgit v1.2.3 From d8565b05a5ccc9df8522db1d0fb32c320fa975b9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Jul 2013 16:33:40 -0400 Subject: CHOP-959: Introduce CmdLineChannel settings var, map --channel to it. --- indra/newview/app_settings/cmd_line.xml | 3 ++- indra/newview/app_settings/settings.xml | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 71a052057c..74117dbd85 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -22,7 +22,8 @@ count 1 - + map-to + CmdLineChannel console diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8a50ca146b..6f50a72016 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1749,6 +1749,17 @@ Value 0 + CmdLineChannel + + Comment + Command line specified channel name + Persist + 0 + Type + String + Value + + CmdLineDisableVoice Comment -- cgit v1.2.3 From d2dd3be08b3d460054366a66481bcf3110005291 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 13 Jul 2013 15:03:39 -0400 Subject: CHOP-963: Add a new --update-service command line argument for QA use --- indra/newview/app_settings/cmd_line.xml | 10 ++++++++++ indra/newview/app_settings/settings.xml | 11 +++++++++++ 2 files changed, 21 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 7ab7787d77..f60fc3afb2 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -108,6 +108,16 @@ CmdLineGridChoice + update-service + + desc + Override the url base for the update query. + count + 1 + map-to + CmdLineUpdateService + + help desc diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 344079b640..0ec3d2545c 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1760,6 +1760,17 @@ Value + CmdLineUpdateService + + Comment + Override the url base for the update query. + Persist + 0 + Type + String + Value + + CmdLineHelperURI Comment -- cgit v1.2.3 From 22140012c2b8f40081027bdcf2f5fbcd8a4527e9 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 15 Aug 2013 12:37:24 +0300 Subject: MAINT-3012 FIXED Don't show Destination Guide by default on first run. --- indra/newview/app_settings/settings_per_account.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 590f41283b..636caf5ef3 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -109,18 +109,7 @@ Boolean Value 0 - - DisplayDestinationsOnInitialRun - - Comment - Display the destinations guide when a user first launches Second Life. - Persist - 1 - Type - Boolean - Value - 1 - + LastInventoryInboxActivity Comment -- cgit v1.2.3