diff options
| author | Maxim Nikolenko <mnikolenko@productengine.com> | 2022-12-03 03:04:01 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 03:04:01 +0200 | 
| commit | 112446804de888eef73f9f655d7c911da2d0a638 (patch) | |
| tree | 020ac9e8f2e7ca3f9d860d7aae6597fe9edf4ba7 /indra/newview | |
| parent | cfc2d2890e02898199337f46f364edc2fd3efcf8 (diff) | |
SL-18486 Complete Avatars floater is blank.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateravatar.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llfloateravatar.h | 3 | 
2 files changed, 12 insertions, 5 deletions
| diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp index 31adf5b61e..f888d032ae 100644 --- a/indra/newview/llfloateravatar.cpp +++ b/indra/newview/llfloateravatar.cpp @@ -44,17 +44,21 @@ LLFloaterAvatar::LLFloaterAvatar(const LLSD& key)  LLFloaterAvatar::~LLFloaterAvatar()  { -	LLMediaCtrl* avatar_picker = findChild<LLMediaCtrl>("avatar_picker_contents"); -	if (avatar_picker) +	if (mAvatarPicker)  	{ -		avatar_picker->navigateStop(); -		avatar_picker->clearCache();          //images are reloading each time already -		avatar_picker->unloadMediaSource(); +		mAvatarPicker->navigateStop(); +        mAvatarPicker->clearCache();          //images are reloading each time already +        mAvatarPicker->unloadMediaSource();  	}  }  BOOL LLFloaterAvatar::postBuild()  { +    mAvatarPicker = findChild<LLMediaCtrl>("avatar_picker_contents"); +    if (mAvatarPicker) +    { +        mAvatarPicker->clearCache(); +    }  	enableResizeCtrls(true, true, false);  	return TRUE;  } diff --git a/indra/newview/llfloateravatar.h b/indra/newview/llfloateravatar.h index cadc5e4028..76e9372709 100644 --- a/indra/newview/llfloateravatar.h +++ b/indra/newview/llfloateravatar.h @@ -29,6 +29,7 @@  #define LL_FLOATER_AVATAR_H  #include "llfloater.h" +class LLMediaCtrl;  class LLFloaterAvatar:  	public LLFloater @@ -38,6 +39,8 @@ private:  	LLFloaterAvatar(const LLSD& key);  	/*virtual*/	~LLFloaterAvatar();  	/*virtual*/	BOOL postBuild(); + +    LLMediaCtrl* mAvatarPicker;  };  #endif | 
