From 658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Apr 2010 11:08:04 -0700 Subject: Re-insert backed out SLE checkin so we can fix it --- indra/newview/app_settings/settings.xml | 115 +++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 30049b73ea..442cd5d31e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1264,6 +1264,17 @@ Value 0 + CertStore + + Comment + Specifies the Certificate Store for certificate trust verification + Persist + 1 + Type + String + Value + default + ChatBarStealsFocus Comment @@ -1640,6 +1651,17 @@ Value 1 + CurrentGrid + + Comment + Currently Selected Grid + Persist + 1 + Type + String + Value + + CustomServer Comment @@ -2366,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 @@ -3442,7 +3487,7 @@ Type Boolean Value - 0 + 1 ForceMandatoryUpdate @@ -7696,6 +7741,17 @@ Value 0 + SecondLifeEnterprise + + Comment + Enables Second Life Enterprise features + Persist + 1 + Type + Boolean + Value + 0 + SelectMovableOnly Comment @@ -8500,7 +8556,7 @@ Type Boolean Value - 0 + 1 ShowTangentBasis @@ -10393,6 +10449,17 @@ Value + VivoxDebugSIPURIHostName + + Comment + Hostname portion of vivox SIP URIs (empty string for the default). + Persist + 1 + Type + String + Value + + VivoxDebugVoiceAccountServerURI Comment @@ -10404,6 +10471,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 @@ -10536,6 +10625,17 @@ Value Default + VoiceLogFile + + Comment + Log file to use when launching the voice daemon + Persist + 1 + Type + String + Value + + VoiceOutputAudioDevice Comment @@ -10580,6 +10680,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 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/settings.xml') 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/settings.xml') 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 9fdba53b09193290ab33fc6aa414329d126505ed Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 21 Apr 2010 00:17:58 -0700 Subject: Show beta grids depending on a settings.xml setting. for SLE, this will be turned off. For trunk, it's turned on. Also, fixed an issue with manual entry of locations into the location dropdown. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 24add573dc..0b2e657fbb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7973,6 +7973,17 @@ Value 0 + ShowBetaGrids + + Comment + Display the beta grids in the grid selection control. + Persist + 1 + Type + Boolean + Value + 1 + ShowCrosshairs Comment -- cgit v1.2.3 From c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 21 Apr 2010 14:22:49 -0700 Subject: Remove diamondware and rearrange login panel to be like it is in the default viewer 2 build --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0b2e657fbb..480c0ffd03 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3488,7 +3488,7 @@ Type Boolean Value - 1 + 0 ForceMandatoryUpdate @@ -8579,7 +8579,7 @@ Type Boolean Value - 1 + 0 ShowTangentBasis -- 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/settings.xml') 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/settings.xml') 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/settings.xml') 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/settings.xml') 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/settings.xml') 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 2a2930d24559c4d33470099807ade5f29d460210 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 4 May 2010 10:37:32 -0700 Subject: DEV-45807 - worldmap doesn't work against non maingrid servers The code used to retrieve the tiles for the world map was hardcoded to retrieve the map tiles via s3. However, non-maingrid servers do not necessarily publish their map tiles to s3. The URL was in the form http://map.secondlife.com.s3.amazonaws.com/map----objects.jpg This change removes the hard coding and places the default s3 URL in the settings.xml file via MapServerURL. Login retrieves the specific grids URL via a map-server-url option. The url is still expected to contain jpegs named like map----objects.jpg CR: Karina Linden --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 75ace99806..02530485de 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4470,6 +4470,17 @@ Value 128.0 + MapServerURL + + Comment + World map URL template for locating map tiles + Persist + 0 + Type + String + Value + http://map.secondlife.com.s3.amazonaws.com/ + MapShowEvents Comment -- 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/settings.xml') 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/settings.xml') 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/settings.xml') 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/settings.xml') 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