From f13884e528c327dbbc638b72322e08b544d0f6c0 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 15 Feb 2011 14:12:58 -0700 Subject: partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. --- 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 6630d8f400..58abd4c091 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8451,6 +8451,17 @@ Value 1 + RenderVBOMappingDisable + + Comment + Disable VBO glMapBufferARB + Persist + 1 + Type + Boolean + Value + 0 + RenderUseStreamVBO Comment -- cgit v1.2.3 From 2ebcf802cbec59b4d9fe404af5bd125818d4eefa Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 22 Feb 2011 13:28:48 -0700 Subject: set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking. --- 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 58abd4c091..a010524091 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8460,7 +8460,7 @@ Type Boolean Value - 0 + 1 RenderUseStreamVBO -- cgit v1.2.3 From 93c38d04a1cea317b8083010694d840f76bbc2ec Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 7 Mar 2011 17:02:18 -0800 Subject: updated destination and avatar urls --- indra/newview/app_settings/settings_minimal.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (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 73c865bc9f..6e0053a3a3 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -303,5 +303,27 @@ Value 0 + DestinationGuideURL + + Comment + Destination guide contents + Persist + 1 + Type + String + Value + http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/guide.html + + AvatarPickerURL + + Comment + Avatar picker contents + Persist + 1 + Type + String + Value + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + -- cgit v1.2.3 From f9d70c41c9b7e7c0bb1cca184e6b5e99fc75a656 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 12:42:15 -0800 Subject: SOCIAL-652 FIX Decline notification shown to users in minimal skin when they click on free one click objects --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- indra/newview/app_settings/settings_minimal.xml | 11 +++++++++++ 2 files changed, 23 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 3dedf0ddd7..a8e9ca3cc9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12487,5 +12487,16 @@ Value 1 - + LogInventoryDecline + + Comment + Log in system chat whenever an inventory offer is declined + 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 6e0053a3a3..e676f41250 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -325,5 +325,16 @@ Value http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + LogInventoryDecline + + Comment + Log in system chat whenever an inventory offer is declined + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 858b7d36ab1a29c9ed30efefe895f10f9fa65310 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 16:30:58 -0800 Subject: updated how to url --- 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 e676f41250..77a3f2a1bb 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -61,7 +61,7 @@ Type String Value - http://interest.secondlife.com/static/viewer/howto/index.html + http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html PreferredMaturity -- cgit v1.2.3 From f3e37e047206b909c212a02493be6972fba2c8aa Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 16:47:12 -0800 Subject: SOCIAL-588 WIP All avatar changes using avatar picker are not completed and incorrect avatar can be worn disable AIS For minimal skin --- 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 a8e9ca3cc9..94a49f2cef 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12498,5 +12498,16 @@ Value 1 + UseHTTPInventory + + Comment + Allow use of http inventory transfers instead of UDP + 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 77a3f2a1bb..b5fb85c929 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -336,5 +336,16 @@ Value 0 + UseHTTPInventory + + Comment + Allow use of http inventory transfers instead of UDP + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 24b254c3934ad13516b1c03bf9799397fb364a81 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 9 Mar 2011 09:56:59 -0800 Subject: updated destination and avatar urls --- 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 3dedf0ddd7..3fc098f020 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html + DisableCameraConstraints -- cgit v1.2.3 From 6158929e3ee87bc879c99d35963a151006394ed7 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 9 Mar 2011 11:51:07 -0800 Subject: SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid --- 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 3dedf0ddd7..ced4c3a2eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3899,6 +3899,17 @@ Value https://my.secondlife.com/[AGENT_NAME] + WebProfileNonProductionURL + + Comment + URL for Web Profiles on Non-Production grids + Persist + 0 + Type + String + Value + https://my-demo.secondlife.com/[AGENT_NAME] + HighResSnapshot Comment -- cgit v1.2.3 From 7781db331f5c96a356a2b27c8d2aba32b6237395 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 10 Mar 2011 14:25:06 -0800 Subject: updated help url to take topic parameter --- indra/newview/app_settings/settings_minimal.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 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 b5fb85c929..73c7c1e4bd 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -61,7 +61,7 @@ Type String Value - http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html + http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html?topic=[TOPIC] PreferredMaturity @@ -347,5 +347,16 @@ Value 0 + ClickToWalk + + Comment + Click in world to walk to location + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From a4d2e10c375ae3c35f5426c0bd45e650197ad189 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 10 Mar 2011 14:27:50 -0800 Subject: SOCIAL-530 WIP When double clicking a nearby location I want my avatar to walk to that spot added setting to toggle click to walk --- 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 ea8b1c681d..88620e4193 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12531,5 +12531,16 @@ Value 1 + ClickToWalk + + Comment + Click in world to walk to location + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 34807845ab6c6440d17624e1cbf042472d25ce9e Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 11 Mar 2011 11:20:20 -0800 Subject: fixed avatar picker url fixed linux build --- 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 73c7c1e4bd..646f5e85bc 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -323,7 +323,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/avatars.html LogInventoryDecline -- cgit v1.2.3