Backed out changeset: c4866eb3df8c - Experimental fix for FIRE-1936 eats up texture memory

Ansariel 2012-10-26 01:03:14 +02:00
parent 2f5666f268
commit 75459a2ac2
1 changed files with 3 additions and 6 deletions

View File

@ -152,14 +152,11 @@ LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
mDrawTooltip(p.draw_tooltip),
mDefaultIconName(p.default_icon_name)
{
// <FS:Ansariel> FIRE-1936: Don't use BOOST_ICON, it will call DontDiscard() and the texture stays in memory!
//mPriority = LLViewerFetchedTexture::BOOST_ICON;
mPriority = LLViewerFetchedTexture::BOOST_HUD;
mPriority = LLViewerFetchedTexture::BOOST_ICON;
LLRect rect = p.rect;
// <FS:Ansariel> FIRE-1936: Restricting the draw size seem to not fully load the image
//mDrawWidth = llmax(32, rect.getWidth()) ;
//mDrawHeight = llmax(32, rect.getHeight()) ;
mDrawWidth = llmax(32, rect.getWidth()) ;
mDrawHeight = llmax(32, rect.getHeight()) ;
static LLUICachedControl<S32> llavatariconctrl_symbol_hpad("UIAvatariconctrlSymbolHPad", 2);
static LLUICachedControl<S32> llavatariconctrl_symbol_vpad("UIAvatariconctrlSymbolVPad", 2);