From 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 6 Nov 2009 06:52:24 +0000 Subject: merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 --- indra/newview/app_settings/settings.xml | 83 +++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7e368b0c9c..aa43f8cd9c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -309,7 +309,18 @@ Value 0 - AutoAcceptNewInventory + AuditTexture + + Comment + Enable texture auditting. + Persist + 1 + Type + Boolean + Value + 0 + + AutoAcceptNewInventory Comment Automatically accept new notecards/textures/landmarks @@ -4545,6 +4556,17 @@ Value 1 + MiniMapPrimMaxRadius + + Comment + Radius of the largest prim to show on the MiniMap. Increasing beyond 256 may cause client lag. + Persist + 1 + Type + F32 + Value + 256.0 + MiniMapRotate Comment @@ -4559,7 +4581,7 @@ MiniMapScale Comment - Miniature world map zoom levle (pixels per region) + Miniature world map zoom level (pixels per region) Persist 1 Type @@ -8468,6 +8490,28 @@ Value 20.0 + TextureDisable + + Comment + If TRUE, do not load textures for in-world content + Persist + 1 + Type + Boolean + Value + 0 + + TextureLoadFullRes + + Comment + If TRUE, always load textures at full resolution (discard = 0) + Persist + 1 + Type + Boolean + Value + 0 + TextureMemory Comment @@ -10537,5 +10581,38 @@ Value 0 - + LogTextureDownloadsToViewerLog + + Comment + Send texture download details to the viewer log + Persist + 1 + Type + Boolean + Value + 0 + + LogTextureDownloadsToSimulator + + Comment + Send a digest of texture info to the sim + Persist + 1 + Type + Boolean + Value + 0 + + TextureLoggingThreshold + + Comment + Specifies the byte threshold at which texture download data should be sent to the sim. + Persist + 1 + Type + U32 + Value + 1 + + -- cgit v1.3 From 30467bda7cd8bc79e9f5fa400cb009ce3dd21a05 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 6 Nov 2009 11:06:20 -0800 Subject: Show glow around interactive objects on hover. Glow shows through objects/avatars - this is expected. Effect from DaveP long ago, hover code by me long ago, just changing the default setting. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/lltoolpie.cpp | 2 ++ indra/newview/skins/default/xui/en/menu_viewer.xml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e8af26c743..330bfa0c22 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6247,7 +6247,7 @@ Type Boolean Value - 0 + 1 RenderHighlightFadeTime diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 24017202cc..93da32b115 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -494,6 +494,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) } else if (handleMediaHover(mHoverPick)) { + // *NOTE: If you think the hover glow conflicts with the media outline, you + // could disable it here. show_highlight = true; // cursor set by media object lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ebdfb01787..294c86a1b9 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2506,8 +2506,8 @@ parameter="RenderAttachedParticles" /> + label="Hover Glow Objects" + name="Hover Glow Objects"> -- cgit v1.3 From d8864522a40b870a0d693dc7b5c76d140936ee25 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 6 Nov 2009 11:09:09 -0800 Subject: Changed default help URL for board demo per email discussion on viewer2009@lists. --- 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 330bfa0c22..b17d621910 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3574,7 +3574,7 @@ Type String Value - http://www.google.com/search?q=site%3Awiki.secondlife.com+[TOPIC]&ignore_channel=[CHANNEL]&ignore_version=[VERSION]&ignore_os=[OS]&ignore_language=[LANGUAGE]&ignore_version_major=[VERSION_MAJOR]&ignore_version_minor=[VERSION_MINOR]&ignore_version_patch=[VERSION_PATCH]&ignore_version_build=[VERSION_BUILD] + http://docs.lindenlab.com/help/helpfloater.php?topic=[TOPIC]&channel=[CHANNEL]&version=[VERSION]&os=[OS]&language=[LANGUAGE]&version_major=[VERSION_MAJOR]&version_minor=[VERSION_MINOR]&version_patch=[VERSION_PATCH]&version_build=[VERSION_BUILD] HighResSnapshot -- cgit v1.3