From fe71dd340ab396b93bde45df438041af5d85fd47 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 1 Feb 2010 15:10:19 -0800 Subject: Merge giab-viewer-trunk 2497, general merge of more secapi stuff as well as certificate handling stuff. Grid manager as well --- indra/newview/app_settings/logcontrol.xml | 8 +++----- indra/newview/app_settings/settings.xml | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index d7bb64ce8a..0eb98e3311 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -20,11 +20,7 @@ tags AppInit - SystemInfo - TextureCache - AppCache - Window - RenderInit + LLLogin @@ -40,6 +36,8 @@ tags + AppInit + LLLogin diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7d98a4b6ce..75ee389750 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1629,6 +1629,17 @@ Value 1 + CurrentGrid + + Comment + Currently Selected Grid + Persist + 1 + Type + String + Value + + CustomServer Comment @@ -3420,7 +3431,7 @@ Type Boolean Value - 0 + 1 ForceMandatoryUpdate @@ -7594,6 +7605,17 @@ Value 0 + SecondLifeEnterprise + + Comment + Enables Second Life Enterprise features + Persist + 1 + Type + Boolean + Value + 0 + SelectMovableOnly Comment -- cgit v1.2.3 From 9e89819d55a3b6ee7fc56f3efb36f273e4e05c83 Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 8 Jul 2009 00:45:17 +0000 Subject: DEV-34822 - merge with 1.23 certificate notification code -r 118191 ignore-dead-branch --- 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 75ee389750..1641ab0ce1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1275,6 +1275,17 @@ Value 0 + CertStore + + Comment + Specifies the Certificate Store for certificate trust verification + Persist + 1 + Type + String + Value + default + ChatBarStealsFocus Comment -- cgit v1.2.3 From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 15 Jul 2009 21:50:42 +0000 Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220 --- indra/newview/app_settings/logcontrol.xml | 6 ++-- indra/newview/app_settings/settings.xml | 55 +++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 0eb98e3311..229f15852d 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -19,8 +19,7 @@ tags - AppInit - LLLogin + Voice @@ -36,8 +35,7 @@ tags - AppInit - LLLogin + Voice diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1641ab0ce1..8ca330ca33 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10312,6 +10312,17 @@ Value + VivoxDebugSIPURIHostName + + Comment + Hostname portion of vivox SIP URIs (empty string for the default). + Persist + 1 + Type + String + Value + + VivoxDebugVoiceAccountServerURI Comment @@ -10323,6 +10334,28 @@ Value + VivoxVoiceHost + + Comment + Client SLVoice host to connect to + Persist + 1 + Type + String + Value + 127.0.0.1 + + VivoxVoicePort + + Comment + Client SLVoice port to connect to + Persist + 1 + Type + U32 + Value + 44125 + VoiceCallsFriendsOnly Comment @@ -10455,6 +10488,17 @@ Value Default + VoiceLogFile + + Comment + Log file to use when launching the voice daemon + Persist + 1 + Type + String + Value + + VoiceOutputAudioDevice Comment @@ -10499,6 +10543,17 @@ Value 0 + VoiceServerType + + Comment + The type of voice server to connect to. + Persist + 0 + Type + String + Value + vivox + WLSkyDetail Comment -- cgit v1.2.3 From 3b9e4f43ed80da14cff984e2cde29dee534e66cd Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Thu, 8 Apr 2010 17:40:17 -0700 Subject: Enabling Watchdog. --- 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 92226f4148..55e28fc59b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10600,7 +10600,7 @@ Type Boolean Value - 0 + 1 WaterEditPresets -- cgit v1.2.3 From 3fca923949667d1c713119043cd4aaeae4acfe09 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 29 Mar 2010 11:58:31 -0700 Subject: Fix initial outfit selection dialog to choose initial outfit based on what's passed up from login.cgi instead of just using hardcoded values. If nothing is passed up, it defaults to values in settings.xml --- indra/newview/app_settings/settings.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6cbb6d05f4..aaa6b874d9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2388,6 +2388,29 @@ Value 0 + DefaultFemaleAvatar + + Comment + Default Female Avatar + Persist + 1 + Type + String + Value + Female Shape & Outfit + + DefaultMaleAvatar + + Comment + Default Male Avatar + Persist + 1 + Type + String + Value + Male Shape & Outfit + + DefaultObjectTexture Comment -- cgit v1.2.3 From 2bb03e5edb5572de1ea31c66f439c8cde9cd2197 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Tue, 30 Mar 2010 16:30:31 -0700 Subject: EXT-6525 - drag threshold is very low for navbar favorites reviewed by Leyla --- 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 73fb24e4eb..e62c4fbfc1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2564,6 +2564,17 @@ Value 0.10000000149 + DragAndDropDistanceThreshold + + Comment + Number of pixels that mouse should move before triggering drag and drop mode + Persist + 1 + Type + S32 + Value + 3 + DropShadowButton Comment -- cgit v1.2.3 From b6109c46451ab097ff4ce9d8d46ca596b0ab0ce0 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 1 Apr 2010 15:10:30 -0700 Subject: EXT-5168 prefs review: Remove "Small nametags" option reviewed by Richard cc#176 --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 73fb24e4eb..f50eee27de 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8653,17 +8653,6 @@ Value 1 - SmallAvatarNames - - Comment - Display avatar name text in smaller font - Persist - 1 - Type - Boolean - Value - 1 - SnapEnabled Comment -- cgit v1.2.3 From 1cd9f71ed18a1c7cdb54aac8c9a7d5f11dd294c4 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 2 Apr 2010 19:51:21 +0300 Subject: Fixed normal bug EXT-6673 (Default sort order of Nerby People list should be by most recent speaker) - corrected the default setting for nearby people sort order. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/175/. --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 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 442cd5d31e..5993eb46fa 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8184,13 +8184,13 @@ NearbyPeopleSortOrder Comment - Specifies sort order for nearby people (0 = by name, 2 = by most recent) + Specifies sort order for nearby people (0 = by name, 3 = by distance, 4 = by most recent) Persist 1 Type U32 Value - 2 + 4 RecentPeopleSortOrder -- cgit v1.2.3 From 7c170abf52813aa45e9bee656e3b5c12d7fbf47e Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 15 Apr 2010 14:38:24 -0400 Subject: EXT-6847 : Deafult configuration has Away timeout set to "Never" Imported from 2.1 into 2.0.1. This fix is a safe change and gives Residents useful information about why an avatar is a cloud (e.g. because the avatar minimized his window and hence is "away"). --- indra/newview/app_settings/settings.xml | 5 +++-- 1 file 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 55e28fc59b..bebf6678d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4,13 +4,14 @@ AFKTimeout Comment - Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never) + Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). + Valid values are: 0, 120, 300, 600, 1800 Persist 1 Type S32 Value - 0 + 300 AdvanceSnapshot -- cgit v1.2.3 From 0bb3f144c0a6712a269246975635962b3b5f48d0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 7 Apr 2010 10:37:07 +0100 Subject: Backed out changeset 63b699f90efd --- indra/newview/app_settings/settings.xml | 115 +------------------------------- 1 file changed, 2 insertions(+), 113 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 442cd5d31e..30049b73ea 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1264,17 +1264,6 @@ Value 0 - CertStore - - Comment - Specifies the Certificate Store for certificate trust verification - Persist - 1 - Type - String - Value - default - ChatBarStealsFocus Comment @@ -1651,17 +1640,6 @@ Value 1 - CurrentGrid - - Comment - Currently Selected Grid - Persist - 1 - Type - String - Value - - CustomServer Comment @@ -2388,29 +2366,6 @@ Value 0 - DefaultFemaleAvatar - - Comment - Default Female Avatar - Persist - 1 - Type - String - Value - Female Shape & Outfit - - DefaultMaleAvatar - - Comment - Default Male Avatar - Persist - 1 - Type - String - Value - Male Shape & Outfit - - DefaultObjectTexture Comment @@ -3487,7 +3442,7 @@ Type Boolean Value - 1 + 0 ForceMandatoryUpdate @@ -7741,17 +7696,6 @@ Value 0 - SecondLifeEnterprise - - Comment - Enables Second Life Enterprise features - Persist - 1 - Type - Boolean - Value - 0 - SelectMovableOnly Comment @@ -8556,7 +8500,7 @@ Type Boolean Value - 1 + 0 ShowTangentBasis @@ -10449,17 +10393,6 @@ Value - VivoxDebugSIPURIHostName - - Comment - Hostname portion of vivox SIP URIs (empty string for the default). - Persist - 1 - Type - String - Value - - VivoxDebugVoiceAccountServerURI Comment @@ -10471,28 +10404,6 @@ Value - VivoxVoiceHost - - Comment - Client SLVoice host to connect to - Persist - 1 - Type - String - Value - 127.0.0.1 - - VivoxVoicePort - - Comment - Client SLVoice port to connect to - Persist - 1 - Type - U32 - Value - 44125 - VoiceCallsFriendsOnly Comment @@ -10625,17 +10536,6 @@ Value Default - VoiceLogFile - - Comment - Log file to use when launching the voice daemon - Persist - 1 - Type - String - Value - - VoiceOutputAudioDevice Comment @@ -10680,17 +10580,6 @@ Value 0 - VoiceServerType - - Comment - The type of voice server to connect to. - Persist - 0 - Type - String - Value - vivox - WLSkyDetail Comment -- cgit v1.2.3 From 8329dbdc37998c227600ca3693ca4767741798a0 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 7 Apr 2010 18:33:05 +0300 Subject: Fixed major bug EXT-6661 (chat log paths reset back to default) * Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ --HG-- branch : product-engine --- .../newview/app_settings/settings_per_account.xml | 56 +++++++++++++++++----- 1 file changed, 43 insertions(+), 13 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 af5fa4f388..3ce32a05b0 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -22,17 +22,6 @@ Value |TOKEN COPY BusyModeResponse| - InstantMessageLogFolder - - Comment - Top level folder to your log files. - Persist - 1 - Type - String - Value - - InstantMessageLogPath Comment @@ -55,10 +44,10 @@ Value 0 - LogChat + LogNearbyChat Comment - Log Chat + Log Nearby Chat messages to a file. Is used instead of LogChat but with the "1" default value. Persist 1 Type @@ -110,5 +99,46 @@ Value 1 + + + + + LogChat + + Comment + Log Chat + Persist + 1 + Type + Boolean + Value + 0 + + LogChatIM + + Comment + Log Incoming Instant Messages with Chat + Persist + 1 + Type + Boolean + Value + 0 + + LogChatTimestamp + + Comment + Log Timestamp of Chat + Persist + 1 + Type + Boolean + Value + 0 + + -- cgit v1.2.3 From bbe9b636b5f78e4fe6d1a4da56a4a66ffef407d1 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 7 Apr 2010 18:33:05 +0300 Subject: Fixed major bug EXT-6661 (chat log paths reset back to default) * Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ (transplanted from 43297b92c1bb7487dab6610bea61acac4c355878) --- .../newview/app_settings/settings_per_account.xml | 56 +++++++++++++++++----- 1 file changed, 43 insertions(+), 13 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 af5fa4f388..3ce32a05b0 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -22,17 +22,6 @@ Value |TOKEN COPY BusyModeResponse| - InstantMessageLogFolder - - Comment - Top level folder to your log files. - Persist - 1 - Type - String - Value - - InstantMessageLogPath Comment @@ -55,10 +44,10 @@ Value 0 - LogChat + LogNearbyChat Comment - Log Chat + Log Nearby Chat messages to a file. Is used instead of LogChat but with the "1" default value. Persist 1 Type @@ -110,5 +99,46 @@ Value 1 + + + + + LogChat + + Comment + Log Chat + Persist + 1 + Type + Boolean + Value + 0 + + LogChatIM + + Comment + Log Incoming Instant Messages with Chat + Persist + 1 + Type + Boolean + Value + 0 + + LogChatTimestamp + + Comment + Log Timestamp of Chat + Persist + 1 + Type + Boolean + Value + 0 + + -- cgit v1.2.3 From 4f20b91acdddc06b7e033afa42e19f993f7efb30 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 13 Apr 2010 10:55:00 +0300 Subject: Fixed normal bug EXT-5973 (converstations button flash count and rate needs to be controllable) Made flashing count and period for IM Well and Notification Well icons configurable via viewer settings: WellIconFlashCount, WellIconFlashPeriod. Due to Flash Timer is implemented as derived class from EventTimer it is impossible to change period in runtime. So, both settings are made as required restart. Also removed deprecated "flash_to_lit_count" & "flash_period" widget params. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/220/ --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file 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 8b66cce8a3..00c29477ce 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10646,6 +10646,28 @@ Value 50.0 + WellIconFlashCount + + Comment + Number of flashes of IM Well and Notification Well icons after which flashing buttons stay lit up. Requires restart. + Persist + 1 + Type + S32 + Value + 3 + + WellIconFlashPeriod + + Comment + Period at which IM Well and Notification Well icons flash (seconds). Requires restart. + Persist + 1 + Type + F32 + Value + 0.25 + WindLightUseAtmosShaders Comment -- cgit v1.2.3 From ab246784b069913363e544ab3c9a9fb615e0c71d Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Tue, 13 Apr 2010 13:32:39 +0300 Subject: Fixed normal bug EXT-6034 (Need "View People Icons" option for group IM window) - added new menu item to participant list menu for group and ad-hoc chats. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/225/. --HG-- branch : product-engine --- 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 00c29477ce..2dda853f73 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5395,6 +5395,17 @@ Value 1 + ParticipantListShowIcons + + Comment + Show/hide people icons in participant list + Persist + 1 + Type + Boolean + Value + 1 + PerAccountSettingsFile Comment -- cgit v1.2.3 From 3a5ae14b85d0ba8d562cddaa06f6c0bc0dccde33 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 13 Apr 2010 18:26:36 +0300 Subject: Completed normal subtask EXT-6621 (Code cleanup: Remove unused LLFloaterActiveSpeakers and related classes from viewer) * Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo. * Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt). * Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove). * Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions. * Also removed old textures related to removed xml and unused in 2.0 anymore. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/ --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 52 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b26077eec9..f76b471c9c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8546,17 +8546,6 @@ Value 0 - ShowVoiceChannelPopup - - Comment - Controls visibility of the current voice channel popup above the voice tab - Persist - 1 - Type - Boolean - Value - 0 - ShowVoiceVisualizersInCalls Comment @@ -8568,17 +8557,6 @@ Value 0 - ShowVolumeSettingsPopup - - Comment - Show individual volume slider for voice, sound effects, etc - Persist - 1 - Type - Boolean - Value - 0 - SkinCurrent Comment @@ -10965,5 +10943,35 @@ Value 1 + + + + ShowVoiceChannelPopup + + Comment + Controls visibility of the current voice channel popup above the voice tab + Persist + 1 + Type + Boolean + Value + 0 + + ShowVolumeSettingsPopup + + Comment + Show individual volume slider for voice, sound effects, etc + Persist + 1 + Type + Boolean + Value + 0 + + + -- cgit v1.2.3 From 2ddcd1dbd3ba838a9fd50f7db3ccf906ecf61ad8 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 14 Apr 2010 16:40:47 +0300 Subject: Fixed critical bug EXT-6847 (Default configuration has Away Timeout set to "Never") Reason: changeset 97654b5b6313 for EXT-4843 [NUX] Set default Preferences. Setting was reset to 0. Fix: restored default value 300. Also updated setting's description with supported combobox values (0, 120, 300, 600, 1800) Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/234/ --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 5 +++-- 1 file 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 f76b471c9c..c9b5631d54 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4,13 +4,14 @@ AFKTimeout Comment - Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never) + Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). + Valid values are: 0, 120, 300, 600, 1800 Persist 1 Type S32 Value - 0 + 300 AdvanceSnapshot -- cgit v1.2.3 From 6ed8c492f5301ec6125f6d57127481c38dd403dc Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Tue, 20 Apr 2010 15:47:02 +0300 Subject: fix for EXT-4082 Normal Uploading huge image crashes viewer https://codereview.productengine.com/secondlife/r/11/ reviewed Tofu Linden --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 22 +++++++++++++++++++++- 1 file changed, 21 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 c9b5631d54..6b9d30423d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10972,7 +10972,27 @@ Value 0 - + max_texture_dimension_X + + Comment + Maximum texture width for user uploaded textures + Persist + Type + S32 + Value + 2048 + + max_texture_dimension_Y + + Comment + Maximum texture height for user uploaded textures + Persist + 1 + Type + S32 + Value + 2048 + -- cgit v1.2.3 From c153b2dbe02604c14c3c691d3fa23f3598a01249 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Tue, 20 Apr 2010 13:23:51 -0700 Subject: Disabling Watchdog Timeout --- 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 bebf6678d4..2a90cdb87c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10601,7 +10601,7 @@ Type Boolean Value - 1 + 0 WaterEditPresets -- cgit v1.2.3 From 4f02217d9d18f6974b368a4110f76c94e12f2e8f Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 23 Apr 2010 19:50:01 +0300 Subject: fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long message was added Decreased limit of teleport offer text invitaton to 178 characters(254 - max_location_url_length(76)) reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/302/ --HG-- branch : product-engine --- 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 4ca23e14a1..a6dbe00759 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10994,5 +10994,16 @@ 2048 + teleport_offer_invitation_max_length + + Comment + Maximum length of teleport offer invitation line editor. 254 - max_location_url_length(76) = 178 + Persist + 1 + Type + S32 + Value + 178 + -- cgit v1.2.3 From dacc5afbf0f1bde7454c1eadf56edb669d0741a9 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Tue, 27 Apr 2010 17:25:01 -0700 Subject: Architectural changes to LLPlugin message processing. LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets. If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame. This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them). This is currently disabled by default, until it's had a bit more focused testing on multiple platforms. Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest. Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation. LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit). The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way. LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame. This should reduce the latency of sending plugin messages. Added a separate fast timer for LLViewerMedia::updateMedia(). --- indra/newview/app_settings/settings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6f11a6d616..280c3d642c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5585,6 +5585,19 @@ Value 8 + + PluginUseReadThread + + Comment + Use a separate thread to read incoming messages from plugins + Persist + 1 + Type + Boolean + Value + 0 + + PrecachingDelay Comment -- cgit v1.2.3 From b6ba0da7f5e8d830f776ec974287b2d451a4715f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 28 Apr 2010 17:48:05 -0700 Subject: Media sound attentuation first pass reviewed by Richard --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 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 a6dbe00759..6f11a6d616 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5838,7 +5838,18 @@ Value 1.0 - RecentItemsSortOrder + MediaRollOffFactor + + Comment + Multiplier to change rate of media attenuation + Persist + 1 + Type + F32 + Value + 10.0 + + RecentItemsSortOrder Comment Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top) -- cgit v1.2.3 From ccd4215fd4292ed34d68dd7be2c2cc2de92addcc Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 30 Apr 2010 19:55:00 +0300 Subject: Implemented task EXT-6559 (Appearance panel: Add edit button in place of the image display next to current look). - Changed the topmost part of the Appearance panel: * Added new "Edit current outfit" button. * Implemented COF status display (unsaved/wearing) according to the spec. * Minor XUI changes (font / dimensions / bg color). - Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel. - Removed the temporary "ShowDebugAppearanceEditor" setting. TODO: use icons from the spec (currently missing). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/339/ --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 280c3d642c..73eb269f66 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7963,17 +7963,6 @@ Value 0 - ShowDebugAppearanceEditor - - Comment - Show debugging appearance editor - Persist - 1 - Type - Boolean - Value - 0 - ShowEmptyFoldersWhenSearching Comment -- cgit v1.2.3 From 07c207346f63d464e45efe0be3aae64138982279 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 30 Apr 2010 15:59:59 -0700 Subject: updated media attenuation function reviewed by Richard --- indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 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 6f11a6d616..266ed2b5fd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5838,7 +5838,7 @@ Value 1.0 - MediaRollOffFactor + MediaRollOffRate Comment Multiplier to change rate of media attenuation @@ -5847,7 +5847,29 @@ Type F32 Value - 10.0 + 0.2 + + MediaRollOffMin + + Comment + Adjusts the distance at which media attentuation starts + Persist + 1 + Type + F32 + Value + 7.0 + + MediaRollOffMax + + Comment + Distance at which media volume is set to 0 + Persist + 1 + Type + F32 + Value + 30.0 RecentItemsSortOrder -- cgit v1.2.3 From 1fa673fa168821698f1f278190f19ad179c2667f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 4 May 2010 17:25:27 -0400 Subject: EXT-7214 : FIXED : Add debug setting to show avatar rez times Changed from #define to debug setting "DebugAvatarRezTime". --- 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 d689822e4e..db5da4c9e5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1652,6 +1652,17 @@ Value + DebugAvatarRezTime + + Comment + Display times for avatars to resolve. + Persist + 1 + Type + Boolean + Value + 0 + DebugBeaconLineWidth Comment -- cgit v1.2.3 From 2673bd28d7bd7ee9f10317e1f90d0608ad0dfc6f Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Wed, 5 May 2010 13:40:55 -0500 Subject: EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by Moss (changes name of setting WindowFullScreen to FullScreen per discussion in jira.) --- indra/newview/app_settings/settings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d689822e4e..65cd91e770 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3467,6 +3467,17 @@ Value 0 + FullScreen + + Comment + Run SL in fullscreen mode + Persist + 1 + Type + Boolean + Value + 0 + FullScreenAspectRatio Comment @@ -10704,17 +10715,6 @@ Value 1 - WindowFullScreen - - Comment - Run SL in fullscreen mode - Persist - 1 - Type - Boolean - Value - 0 - WindowHeight Comment -- cgit v1.2.3 From 17b42d5c5e0577cfcb59dc8972ddee602938d419 Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Thu, 6 May 2010 19:52:56 +0300 Subject: EXT-6102 FIXED Add custom view for world rect with special reshape processing reviwed Mike Antipov at https://codereview.productengine.com/secondlife/r/357/ --HG-- branch : product-engine --- 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 c1484f15d2..3aab27ab4b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8139,6 +8139,17 @@ Value 1 + SidebarCameraMovement + + Comment + Reflects world rect changing while changing sidebar visibility. + Persist + 1 + Type + Boolean + Value + 1 + GroupListShowIcons Comment -- cgit v1.2.3 From f28887554e6d7d6df393ad6335fe9710149000b6 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 7 May 2010 16:33:18 -0400 Subject: EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking") In viewer2.0, paste as link was only allowed in god mode. Here, it is allowable if the user sets a debug setting. This prevents normal users from accidentally screwing up their inventory if they don't understand what a link is. --- 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 3aab27ab4b..35b5d0c0f5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3819,6 +3819,17 @@ Value 1.0 + InventoryLinking + + Comment + Enable ability to create links to folders and items via "Paste as link". + Persist + 1 + Type + Boolean + Value + 0 + InventorySortOrder Comment -- cgit v1.2.3