summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-10 10:22:25 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-10 10:22:25 +0100
commit8a21f5e24145835db65e486bdca5692d2b4d8979 (patch)
treeeff902c19f0892dff1f2f21783a109bc5382155d /indra/newview/llappearancemgr.cpp
parent3296f3b86452fddc840a3cb140d600fe0d5351dd (diff)
parent820cffd56df5204e2aa0ceb6ce556a318dfaad7b (diff)
merge the latest ECC/Shining sprint work. http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 7159d89d21..ed5e8ceee3 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -31,6 +31,7 @@
#include "llagentcamera.h"
#include "llagentwearables.h"
#include "llappearancemgr.h"
+#include "llattachmentsmgr.h"
#include "llcommandhandler.h"
#include "lleventtimer.h"
#include "llgesturemgr.h"
@@ -2644,6 +2645,8 @@ LLAppearanceMgr::LLAppearanceMgr():
mUnlockOutfitTimer.reset(new LLOutfitUnLockTimer(gSavedSettings.getS32(
"OutfitOperationsTimeout")));
+
+ gIdleCallbacks.addFunction(&LLAttachmentsMgr::onIdle,NULL);
}
LLAppearanceMgr::~LLAppearanceMgr()