From f015c073cdbf32d90ff443eec0b31bbd6a94c102 Mon Sep 17 00:00:00 2001 From: jenn Date: Wed, 13 Jul 2011 00:16:43 +0000 Subject: Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior. --- 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 4b62e376b5..2bd106a42e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12578,13 +12578,13 @@ WatchdogEnabled Comment - Controls whether the thread watchdog timer is activated. + Controls whether the thread watchdog timer is activated. Value is watchdog timeout in seconds. Set to -1 to disable. Persist 0 Type S32 Value - 20 + 60 WaterGLFogDensityScale -- cgit v1.2.3 From 86a806137be05b4be812a121fb6dc91dfacd037f Mon Sep 17 00:00:00 2001 From: jenn Date: Fri, 15 Jul 2011 23:26:19 +0000 Subject: After review and testing, realized that 'WatchdogEnabled' is actually true to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds. --- indra/newview/app_settings/settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 2bd106a42e..1dfc84a4f7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4894,7 +4894,7 @@ Type F32 Value - 20.0 + 60.0 MapOverlayIndex @@ -12578,13 +12578,13 @@ WatchdogEnabled Comment - Controls whether the thread watchdog timer is activated. Value is watchdog timeout in seconds. Set to -1 to disable. + Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default. Persist 0 Type S32 Value - 60 + 1 WaterGLFogDensityScale -- cgit v1.2.3 From 563c942a346cb44b18c12bb58b639410136b33d9 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 19 Jul 2011 21:21:11 +0300 Subject: STORM-1487 FIXED Changed the "get more gestures" marketplace URL. --- 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 58b0879fde..9bb320d882 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3848,7 +3848,7 @@ Type String Value - https://www.xstreetsl.com/modules.php?name=Marketplace&CategoryID=233 + https://marketplace.secondlife.com/products/search?search[category_id]=200&search[maturity][]=General&search[page]=1&search[per_page]=12 GridCrossSections -- cgit v1.2.3 From 6a52c25d2b1be2e5cfb5c006a1b8b18c0ed4ba97 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 26 Jul 2011 10:40:05 -0400 Subject: storm-1510: remove loginpage url from settings file (per code review suggestion from Richard) --- 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 5ad62d28c0..4f5aa05b38 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4872,7 +4872,7 @@ Type String Value - http://viewer-login.agni.lindenlab.com/ + LosslessJ2CUpload -- cgit v1.2.3 From 6850f13f50d90d19db2e119ed1596abd1bdd9b36 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 Jul 2011 15:08:27 -0400 Subject: late fix to set watchdog on at 60 seconds --- 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 5ad62d28c0..598303718c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4894,7 +4894,7 @@ Type F32 Value - 20.0 + 60.0 MapOverlayIndex @@ -12584,7 +12584,7 @@ Type S32 Value - -1 + 1 WaterGLFogDensityScale -- cgit v1.2.3 From 01ee25cca43b175567859becd1eacf77db24af55 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 2 Aug 2011 19:16:56 -0400 Subject: disable watchdog --- 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 598303718c..27c3e42a37 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12584,7 +12584,7 @@ Type S32 Value - 1 + 0 WaterGLFogDensityScale -- cgit v1.2.3