From 35df5441d3e2789663532c948731aff3a1e04728 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 14 Jun 2010 12:04:49 +0200 Subject: llmediaplugins first step --- linden/indra/newview/app_settings/settings.xml | 35 +++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/app_settings/settings.xml') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 0a27aa2..4d80845 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -7624,7 +7624,40 @@ Value 0 - MemoryLogFrequency + MediaControlFadeTime + + Comment + Amount of time (in seconds) that the media control fades + Persist + 1 + Type + F32 + Value + 1.5 + + MediaControlTimeout + + Comment + Amount of time (in seconds) for media controls to fade with no mouse activity + Persist + 1 + Type + F32 + Value + 3.0 + + MediaOnAPrimUI + + Comment + Whether or not to show the "link sharing" UI + Persist + 1 + Type + Boolean + Value + 0 + + MemoryLogFrequency Comment Seconds between display of Memory in log (0 for never) -- cgit v1.1 From 09b7d25b1d24b5b6d5bb1ce31544d8f4abaa3bb7 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 7 Sep 2010 10:08:26 +0200 Subject: lost in merge: 1 debug setting, some member variables from llpanellandmedia todo: review llpanellandmedia; port flotervoicelicense --- linden/indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'linden/indra/newview/app_settings/settings.xml') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 4d80845..f70c0fc 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -4135,6 +4135,17 @@ Value 0 + DebugPluginDisableTimeout + + Comment + Disable the code which watches for plugins that are crashed or hung + Persist + 1 + Type + Boolean + Value + 0 + DebugShowColor Comment -- cgit v1.1 From 087e15e89930d51c3964329befb273ae3b2d330d Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 7 Sep 2010 13:41:02 +0200 Subject: port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system --- linden/indra/newview/app_settings/settings.xml | 735 +++++++++++++++++++++++-- 1 file changed, 698 insertions(+), 37 deletions(-) (limited to 'linden/indra/newview/app_settings/settings.xml') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index f70c0fc..c7f8d36 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -5097,6 +5097,21 @@ Value 1 + + + EnableTextureAtlas + + Comment + Whether to use texture atlas or not + Persist + 1 + Type + Boolean + Value + 0 + + + EnableVoiceChat Comment @@ -8928,11 +8943,74 @@ Vector3 Value + 1.0 + 12.0 + 32.0 + + + RenderShadowSplitExponent + + Comment + Near clip plane split distances for shadow map frusta (x=perspective, y=ortho, z=transition rate). + Persist + 1 + Type + Vector3 + Value + + 3.0 + 3.0 + 2.0 + + + RenderShadowOrthoClipPlanes + + Comment + Near clip plane split distances for orthographic shadow map frusta. + Persist + 1 + Type + Vector3 + Value + 4.0 8.0 24.0 + RenderShadowProjOffset + + Comment + Amount to scale distance to virtual origin of shadow perspective projection. + Persist + 1 + Type + F32 + Value + 2.0 + + RenderShadowSlopeThreshold + + Comment + Cutoff slope value for points to affect perspective shadow generation + Persist + 1 + Type + F32 + Value + 0.0 + + RenderShadowProjExponent + + Comment + Exponent applied to transition between ortho and perspective shadow projections based on viewing angle and light vector. + Persist + 1 + Type + F32 + Value + 0.5 + RenderSSAOScale Comment @@ -9092,6 +9170,184 @@ Value 0 + + RenderGILightRadius + + Comment + Distance of ambiant bounce lighting from sun. + Persist + 1 + Type + F32 + Value + 8 + + + RenderGISamples + + Comment + Number of samples to take for GI. + Persist + 1 + Type + U32 + Value + 64 + + + RenderGIRange + + Comment + Distance to cut off GI effect. + Persist + 1 + Type + F32 + Value + 128 + + + + RenderGIDirectionWeight + + Comment + Weight of reflected light vector in GI angular attenuation. + Persist + 1 + Type + F32 + Value + 0.5 + + + RenderGILightOffset + + Comment + Amount to offset light from point of impact in gi map (scaled by light radius). + Persist + 1 + Type + F32 + Value + 0.0 + + + RenderGIColorCurve + + Comment + Global illumination color correction curve parameters. + Persist + 1 + Type + Vector3 + Value + + 0.0 + 0.2 + 0.02 + + + + RenderLuminanceColorCurve + + Comment + Luminance color correction curve parameters. + Persist + 1 + Type + Vector3 + Value + + 0.30 + 0.0 + 0.04 + + + + RenderGILuminanceColorCurve + + Comment + Luminance color correction curve parameters. + Persist + 1 + Type + Vector3 + Value + + 0.4 + 0.0 + 0.05 + + + + RenderSunLuminanceColorCurve + + Comment + Luminance color correction curve parameters. + Persist + 1 + Type + Vector3 + Value + + 0.6 + 0.0 + -0.3 + + + + RenderLuminanceDetail + + Comment + Mipmap level to use for luminance + Persist + 1 + Type + F32 + Value + 8.0 + + + RenderLuminanceFade + + Comment + Scaler for speed of luminance adjustment + Persist + 1 + Type + F32 + Value + 0.05 + + + RenderGISpecularCurve + + Comment + Global illumination specular color correction curve parameters. + Persist + 1 + Type + Vector3 + Value + + 0.1 + 0.0 + 0.9 + + + + RenderGIIntensity + + Comment + Distance of ambiant bounce lighting from sun. + Persist + 1 + Type + F32 + Value + 0.2f + + RenderDeferredAlphaSoften Comment @@ -9114,89 +9370,472 @@ Value 4 - RenderDeferred + RenderDeferredSpotShadowBias Comment - Use deferred rendering pipeline. + Bias value for spot shadows (prevent shadow acne). Persist 1 Type - Boolean + F32 Value - 0 + -64.0 - RenderDeferredSunShadow + RenderDeferredSpotShadowOffset Comment - Generate shadows from the sun. + Offset value for spot shadows (prevent shadow acne). Persist 1 Type - Boolean + F32 Value + 0.8 + + + RenderShadowBias + + Comment + Bias value for shadows (prevent shadow acne). + Persist 1 + Type + F32 + Value + 0.001 - RenderDeferredSunWash + RenderShadowOffset Comment - Amount local lights are washed out by sun. + Offset value for shadows (prevent shadow acne). Persist 1 Type F32 Value - 0.5 + 0.6 - RenderShadowNoise + + RenderShadowResolutionScale Comment - Magnitude of noise on shadow samples. + Scale of shadow map resolution vs. screen resolution Persist 1 Type F32 Value - -0.0001 + 1.0 - RenderShadowBlurSize + + + + RenderDeferredTreeShadowBias Comment - Scale of shadow softening kernel. + Bias value for tree shadows (prevent shadow acne). Persist 1 Type F32 Value - 0.7 + 1.0 - RenderShadowBlurSamples + RenderDeferredTreeShadowOffset Comment - Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1. + Offset value for tree shadows (prevent shadow acne). Persist 1 Type - U32 + F32 Value - 5 + 1.0 - RenderDynamicLOD - - Comment - Dynamically adjust level of detail. - Persist - 1 - Type - Boolean - Value - 1 - - RenderFSAASamples - - Comment - Number of samples to use for FSAA (0 = no AA). - Persist - 1 + + RenderHighlightFadeTime + + Comment + Transition time for mouseover highlights. + Persist + 1 + Type + F32 + Value + 0.2 + + + RenderHighlightBrightness + + Comment + Brightness of mouseover highlights. + Persist + 1 + Type + F32 + Value + 4.0 + + + RenderHighlightThickness + + Comment + Thickness of mouseover highlights. + Persist + 1 + Type + F32 + Value + 0.6 + + + RenderHighlightColor + + Comment + Brightness of mouseover highlights. + Persist + 1 + Type + Color4 + Value + + 0.4 + 0.98 + 0.93 + 1.0 + + + + RenderSpecularResX + + Comment + Spec map resolution. + Persist + 1 + Type + U32 + Value + 128 + + + RenderSpecularResY + + Comment + Spec map resolution. + Persist + 1 + Type + U32 + Value + 128 + + + RenderSpecularExponent + + Comment + Specular exponent for generating spec map + Persist + 1 + Type + F32 + Value + 1 + + + RenderDeferred + + Comment + Use deferred rendering pipeline. + Persist + 1 + Type + Boolean + Value + 0 + + + RenderDeferredShadow + + Comment + Enable shadows in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredGI + + Comment + Enable GI in deferred renderer. + Persist + 1 + Type + Boolean + Value + 0 + + + RenderDeferredSunShadow + + Comment + Generate shadows from the sun. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredSun + + Comment + Execute sunlight shader in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredAtmospheric + + Comment + Execute atmospheric shader in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredBlurLight + + Comment + Execute shadow softening shader in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredLocalLights + + Comment + Execute local lighting shader in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredFullscreenLights + + Comment + Execute local lighting shader in deferred renderer. + Persist + 1 + Type + Boolean + Value + 1 + + + RenderDeferredSunWash + + Comment + Amount local lights are washed out by sun. + Persist + 1 + Type + F32 + Value + 0.5 + + RenderShadowNoise + + Comment + Magnitude of noise on shadow samples. + Persist + 1 + Type + F32 + Value + -0.0001 + + RenderShadowErrorCutoff + + Comment + Cutoff error value to use ortho instead of perspective projection. + Persist + 1 + Type + F32 + Value + 5.0 + + RenderShadowFOVCutoff + + Comment + Cutoff FOV to use ortho instead of perspective projection. + Persist + 1 + Type + F32 + Value + 1.1 + + + RenderShadowGaussian + + Comment + Gaussian coefficients for the two shadow/SSAO blurring passes (z component unused). + Persist + 1 + Type + Vector3 + Value + + 3.0 + 2.0 + 0.0 + + + + RenderShadowBlurSize + + Comment + Scale of shadow softening kernel. + Persist + 1 + Type + F32 + Value + 0.8 + + RenderShadowBlurSamples + + Comment + Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1. + Persist + 1 + Type + U32 + Value + 4 + + RenderShadowBlurDistFactor + + Comment + Distance scaler for shadow blur. + Persist + 1 + Type + F32 + Value + 0.1 + + + RenderGIBlurColorCurve + + Comment + Color curve for GI softening kernel + Persist + 1 + Type + Vector3 + Value + + 1.0 + 0.6 + 0.1 + + + + RenderGIGaussian + + Comment + Gaussian coefficient for the two GI blurring passes. + Persist + 1 + Type + F32 + Value + 64 + + + RenderGIBlurPasses + + Comment + Scale of GI softening kernel. + Persist + 1 + Type + U32 + Value + 2 + + + RenderGIBlurSize + + Comment + Scale of GI softening kernel. + Persist + 1 + Type + F32 + Value + 3.0 + + RenderGIBlurSamples + + Comment + Number of samples to take for each pass of GI blur (value range 1-16). Actual number of samples is value * 2 - 1. + Persist + 1 + Type + U32 + Value + 6 + + RenderGIBlurDistFactor + + Comment + Distance scaler for GI blur. + Persist + 1 + Type + F32 + Value + 0.0 + + + RenderDynamicLOD + + Comment + Dynamically adjust level of detail. + Persist + 1 + Type + Boolean + Value + 1 + + RenderFSAASamples + + Comment + Number of samples to use for FSAA (0 = no AA). + Persist + 1 Type U32 Value @@ -9430,6 +10069,17 @@ Value 0 + RenderHighlightSelections + + Comment + Show selection outlines on objects + Persist + 1 + Type + Boolean + Value + 1 + RenderHiddenSelections Comment @@ -9738,6 +10388,17 @@ Value 0 + RenderUIBuffer + + Comment + Cache ui render in a screen aligned buffer. + Persist + 1 + Type + Boolean + Value + 0 + RenderUnloadedAvatar Comment -- cgit v1.1 From b3b30285126289f54b57bd42569bb0721e40e088 Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Sun, 10 Oct 2010 22:10:33 +0100 Subject: Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h --- linden/indra/newview/app_settings/settings.xml | 701 +------------------------ 1 file changed, 20 insertions(+), 681 deletions(-) (limited to 'linden/indra/newview/app_settings/settings.xml') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index d306f0d..57ed4c0 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -5122,21 +5122,6 @@ Value 1 - - - EnableTextureAtlas - - Comment - Whether to use texture atlas or not - Persist - 1 - Type - Boolean - Value - 0 - - - EnableVoiceChat Comment @@ -8968,74 +8953,11 @@ Vector3 Value - 1.0 - 12.0 - 32.0 - - - RenderShadowSplitExponent - - Comment - Near clip plane split distances for shadow map frusta (x=perspective, y=ortho, z=transition rate). - Persist - 1 - Type - Vector3 - Value - - 3.0 - 3.0 - 2.0 - - - RenderShadowOrthoClipPlanes - - Comment - Near clip plane split distances for orthographic shadow map frusta. - Persist - 1 - Type - Vector3 - Value - 4.0 8.0 24.0 - RenderShadowProjOffset - - Comment - Amount to scale distance to virtual origin of shadow perspective projection. - Persist - 1 - Type - F32 - Value - 2.0 - - RenderShadowSlopeThreshold - - Comment - Cutoff slope value for points to affect perspective shadow generation - Persist - 1 - Type - F32 - Value - 0.0 - - RenderShadowProjExponent - - Comment - Exponent applied to transition between ortho and perspective shadow projections based on viewing angle and light vector. - Persist - 1 - Type - F32 - Value - 0.5 - RenderSSAOScale Comment @@ -9195,184 +9117,6 @@ Value 0 - - RenderGILightRadius - - Comment - Distance of ambiant bounce lighting from sun. - Persist - 1 - Type - F32 - Value - 8 - - - RenderGISamples - - Comment - Number of samples to take for GI. - Persist - 1 - Type - U32 - Value - 64 - - - RenderGIRange - - Comment - Distance to cut off GI effect. - Persist - 1 - Type - F32 - Value - 128 - - - - RenderGIDirectionWeight - - Comment - Weight of reflected light vector in GI angular attenuation. - Persist - 1 - Type - F32 - Value - 0.5 - - - RenderGILightOffset - - Comment - Amount to offset light from point of impact in gi map (scaled by light radius). - Persist - 1 - Type - F32 - Value - 0.0 - - - RenderGIColorCurve - - Comment - Global illumination color correction curve parameters. - Persist - 1 - Type - Vector3 - Value - - 0.0 - 0.2 - 0.02 - - - - RenderLuminanceColorCurve - - Comment - Luminance color correction curve parameters. - Persist - 1 - Type - Vector3 - Value - - 0.30 - 0.0 - 0.04 - - - - RenderGILuminanceColorCurve - - Comment - Luminance color correction curve parameters. - Persist - 1 - Type - Vector3 - Value - - 0.4 - 0.0 - 0.05 - - - - RenderSunLuminanceColorCurve - - Comment - Luminance color correction curve parameters. - Persist - 1 - Type - Vector3 - Value - - 0.6 - 0.0 - -0.3 - - - - RenderLuminanceDetail - - Comment - Mipmap level to use for luminance - Persist - 1 - Type - F32 - Value - 8.0 - - - RenderLuminanceFade - - Comment - Scaler for speed of luminance adjustment - Persist - 1 - Type - F32 - Value - 0.05 - - - RenderGISpecularCurve - - Comment - Global illumination specular color correction curve parameters. - Persist - 1 - Type - Vector3 - Value - - 0.1 - 0.0 - 0.9 - - - - RenderGIIntensity - - Comment - Distance of ambiant bounce lighting from sun. - Persist - 1 - Type - F32 - Value - 0.2f - - RenderDeferredAlphaSoften Comment @@ -9395,455 +9139,72 @@ Value 4 - RenderDeferredSpotShadowBias - - Comment - Bias value for spot shadows (prevent shadow acne). - Persist - 1 - Type - F32 - Value - -64.0 - - RenderDeferredSpotShadowOffset + RenderDeferred Comment - Offset value for spot shadows (prevent shadow acne). + Use deferred rendering pipeline. Persist 1 Type - F32 + Boolean Value - 0.8 + 0 - - RenderShadowBias + RenderDeferredSunShadow Comment - Bias value for shadows (prevent shadow acne). + Generate shadows from the sun. Persist 1 Type - F32 + Boolean Value - 0.001 - - RenderShadowOffset - - Comment - Offset value for shadows (prevent shadow acne). - Persist 1 - Type - F32 - Value - 0.6 - - RenderShadowResolutionScale + RenderDeferredSunWash Comment - Scale of shadow map resolution vs. screen resolution + Amount local lights are washed out by sun. Persist 1 Type F32 Value - 1.0 + 0.5 - - - - RenderDeferredTreeShadowBias + RenderShadowNoise Comment - Bias value for tree shadows (prevent shadow acne). + Magnitude of noise on shadow samples. Persist 1 Type F32 Value - 1.0 + -0.0001 - RenderDeferredTreeShadowOffset + RenderShadowBlurSize Comment - Offset value for tree shadows (prevent shadow acne). + Scale of shadow softening kernel. Persist 1 Type F32 Value - 1.0 + 0.7 - - RenderHighlightFadeTime + RenderShadowBlurSamples Comment - Transition time for mouseover highlights. + Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1. Persist 1 Type - F32 + U32 Value - 0.2 + 5 - - RenderHighlightBrightness - - Comment - Brightness of mouseover highlights. - Persist - 1 - Type - F32 - Value - 4.0 - - - RenderHighlightThickness - - Comment - Thickness of mouseover highlights. - Persist - 1 - Type - F32 - Value - 0.6 - - - RenderHighlightColor - - Comment - Brightness of mouseover highlights. - Persist - 1 - Type - Color4 - Value - - 0.4 - 0.98 - 0.93 - 1.0 - - - - RenderSpecularResX - - Comment - Spec map resolution. - Persist - 1 - Type - U32 - Value - 128 - - - RenderSpecularResY - - Comment - Spec map resolution. - Persist - 1 - Type - U32 - Value - 128 - - - RenderSpecularExponent - - Comment - Specular exponent for generating spec map - Persist - 1 - Type - F32 - Value - 1 - - - RenderDeferred - - Comment - Use deferred rendering pipeline. - Persist - 1 - Type - Boolean - Value - 0 - - - RenderDeferredShadow - - Comment - Enable shadows in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredGI - - Comment - Enable GI in deferred renderer. - Persist - 1 - Type - Boolean - Value - 0 - - - RenderDeferredSunShadow - - Comment - Generate shadows from the sun. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredSun - - Comment - Execute sunlight shader in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredAtmospheric - - Comment - Execute atmospheric shader in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredBlurLight - - Comment - Execute shadow softening shader in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredLocalLights - - Comment - Execute local lighting shader in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredFullscreenLights - - Comment - Execute local lighting shader in deferred renderer. - Persist - 1 - Type - Boolean - Value - 1 - - - RenderDeferredSunWash - - Comment - Amount local lights are washed out by sun. - Persist - 1 - Type - F32 - Value - 0.5 - - RenderShadowNoise - - Comment - Magnitude of noise on shadow samples. - Persist - 1 - Type - F32 - Value - -0.0001 - - RenderShadowErrorCutoff - - Comment - Cutoff error value to use ortho instead of perspective projection. - Persist - 1 - Type - F32 - Value - 5.0 - - RenderShadowFOVCutoff - - Comment - Cutoff FOV to use ortho instead of perspective projection. - Persist - 1 - Type - F32 - Value - 1.1 - - - RenderShadowGaussian - - Comment - Gaussian coefficients for the two shadow/SSAO blurring passes (z component unused). - Persist - 1 - Type - Vector3 - Value - - 3.0 - 2.0 - 0.0 - - - - RenderShadowBlurSize - - Comment - Scale of shadow softening kernel. - Persist - 1 - Type - F32 - Value - 0.8 - - RenderShadowBlurSamples - - Comment - Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1. - Persist - 1 - Type - U32 - Value - 4 - - RenderShadowBlurDistFactor - - Comment - Distance scaler for shadow blur. - Persist - 1 - Type - F32 - Value - 0.1 - - - RenderGIBlurColorCurve - - Comment - Color curve for GI softening kernel - Persist - 1 - Type - Vector3 - Value - - 1.0 - 0.6 - 0.1 - - - - RenderGIGaussian - - Comment - Gaussian coefficient for the two GI blurring passes. - Persist - 1 - Type - F32 - Value - 64 - - - RenderGIBlurPasses - - Comment - Scale of GI softening kernel. - Persist - 1 - Type - U32 - Value - 2 - - - RenderGIBlurSize - - Comment - Scale of GI softening kernel. - Persist - 1 - Type - F32 - Value - 3.0 - - RenderGIBlurSamples - - Comment - Number of samples to take for each pass of GI blur (value range 1-16). Actual number of samples is value * 2 - 1. - Persist - 1 - Type - U32 - Value - 6 - - RenderGIBlurDistFactor - - Comment - Distance scaler for GI blur. - Persist - 1 - Type - F32 - Value - 0.0 - - RenderDynamicLOD Comment @@ -10094,17 +9455,6 @@ Value 0 - RenderHighlightSelections - - Comment - Show selection outlines on objects - Persist - 1 - Type - Boolean - Value - 1 - RenderHiddenSelections Comment @@ -10413,17 +9763,6 @@ Value 0 - RenderUIBuffer - - Comment - Cache ui render in a screen aligned buffer. - Persist - 1 - Type - Boolean - Value - 0 - RenderUnloadedAvatar Comment -- cgit v1.1 From 6f52903897ccb2ddd88049cd3137cf554ef45621 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 19 Oct 2010 21:14:03 +0200 Subject: Sync LLViewerMediaImpl::newSourceFromMediaType with SG2 Also renamed CookiesEnabled to BrowswerCookiesEnabled. Added BrowserJavascriptEnabled, BrowserPluginsEnabled and PluginAttachDebuggerToPlugins. --- linden/indra/newview/app_settings/settings.xml | 55 ++++++++++++++++++++------ 1 file changed, 44 insertions(+), 11 deletions(-) (limited to 'linden/indra/newview/app_settings/settings.xml') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 57ed4c0..417ddc3 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -2612,6 +2612,39 @@ Value 0 + BrowserCookiesEnabled + + Comment + Accept cookies from Web sites? + Persist + 1 + Type + Boolean + Value + 1 + + BrowserJavascriptEnabled + + Comment + Enable Javascript in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + + BrowserPluginsEnabled + + Comment + Enable Web plugins in the built-in Web browser? + Persist + 1 + Type + Boolean + Value + 1 + BrowserProxyAddress Comment @@ -4050,17 +4083,6 @@ Value 0 - CookiesEnabled - - Comment - Accept cookies from Web sites? - Persist - 1 - Type - Boolean - Value - 1 - CreateToolCopyCenters Comment @@ -8460,6 +8482,17 @@ Value 1 + PluginAttachDebuggerToPlugins + + Comment + If true, attach a debugger session to each plugin process as it's launched. + Persist + 1 + Type + Boolean + Value + 0 + PrecachingDelay Comment -- cgit v1.1