summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatar.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-05-12 20:01:20 +0300
committerandreykproductengine <akleshchev@productengine.com>2014-05-12 20:01:20 +0300
commitb36458a98fb3aeb63d2aca5e3249c7aa508192c8 (patch)
tree34b4d349814cc52d38fc45e0d06bf478aa06fa0e /indra/newview/llfloateravatar.cpp
parent7fb4b417ce2048305eab6f1dbf51276697a94ff1 (diff)
MAINT-1734 FIXED Avatar chooser panel is empty the session after an avatar is chosen.
Diffstat (limited to 'indra/newview/llfloateravatar.cpp')
-rwxr-xr-xindra/newview/llfloateravatar.cpp8
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()