diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
| commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
| tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/llfloateravatar.cpp | |
| parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
| parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) | |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/llfloateravatar.cpp')
| -rwxr-xr-x | indra/newview/llfloateravatar.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp index bdc5b581a9..31adf5b61e 100755 --- a/indra/newview/llfloateravatar.cpp +++ b/indra/newview/llfloateravatar.cpp @@ -34,6 +34,7 @@ #include "llfloateravatar.h" #include "lluictrlfactory.h" +#include "llmediactrl.h" LLFloaterAvatar::LLFloaterAvatar(const LLSD& key) @@ -43,6 +44,13 @@ LLFloaterAvatar::LLFloaterAvatar(const LLSD& key) LLFloaterAvatar::~LLFloaterAvatar() { + LLMediaCtrl* avatar_picker = findChild<LLMediaCtrl>("avatar_picker_contents"); + if (avatar_picker) + { + avatar_picker->navigateStop(); + avatar_picker->clearCache(); //images are reloading each time already + avatar_picker->unloadMediaSource(); + } } BOOL LLFloaterAvatar::postBuild() |