From 5a220b63ca3a485ac251f44f7bebf029a7670542 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 12 Nov 2009 16:01:48 -0800 Subject: added comments to textures.xml --- indra/newview/skins/default/textures/textures.xml | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index eea2dfb1a1..4c272b6bb5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,3 +1,33 @@ + + -- cgit v1.2.3 From ffadb3d29fe4e7be69dbb26650737c061c3cb206 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 12 Nov 2009 16:13:46 -0800 Subject: renamed UIImageDeclaration::scale_rect to scale to be consistent with XML attribute name --- indra/newview/llviewertexturelist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 081b7cc483..de854cb7b4 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1461,14 +1461,14 @@ struct UIImageDeclaration : public LLInitParam::Block Mandatory name; Optional file_name; Optional preload; - Optional scale_rect; + Optional scale; Optional use_mips; UIImageDeclaration() : name("name"), file_name("file_name"), preload("preload", false), - scale_rect("scale"), + scale("scale"), use_mips("use_mips", false) {} }; @@ -1558,7 +1558,7 @@ bool LLUIImageList::initFromFile() { continue; } - preloadUIImage(image_it->name, file_name, image_it->use_mips, image_it->scale_rect); + preloadUIImage(image_it->name, file_name, image_it->use_mips, image_it->scale); } if (cur_pass == PASS_DECODE_NOW && !gSavedSettings.getBOOL("NoPreload")) -- cgit v1.2.3