livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed UIImageDeclaration::scale_rect to scale to be consistent with XML attribute name

meow-7.2.2
richard 2009-11-12 16:13:46 -08:00
parent 5a220b63ca
commit ffadb3d29f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewertexturelist.cpp
View File

@ -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"))