diff options
| author | richard <none@none> | 2009-11-12 16:13:46 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-12 16:13:46 -0800 |
| commit | ffadb3d29fe4e7be69dbb26650737c061c3cb206 (patch) | |
| tree | 347889bc7277ff2e4c024108b3bb92d85b6d243c | |
| parent | 5a220b63ca3a485ac251f44f7bebf029a7670542 (diff) | |
renamed UIImageDeclaration::scale_rect to scale to be consistent with XML attribute name
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 6 |
1 files 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<UIImageDeclaration> Mandatory<std::string> name; Optional<std::string> file_name; Optional<bool> preload; - Optional<LLRect> scale_rect; + Optional<LLRect> scale; Optional<bool> 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")) |