summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-12 16:43:49 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-12 16:43:49 +0000
commit0b8e1d87c5d6ca1c0b373477575348e57197736e (patch)
tree4ba20793eb653689403fb7f1ee4b0ef21121a999 /indra/newview/llappearancemgr.cpp
parent88386000af9fb830e61b29494a568e0fa2355f5a (diff)
parent8f548880714b84d5fc557fd2c1e1344c55dcfb54 (diff)
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f686eccf37..82110f3ab7 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -436,9 +436,9 @@ void LLWearableHoldingPattern::checkMissingWearables()
}
}
+ mWaitTime.reset();
if (!pollMissingWearables())
{
- mWaitTime.reset();
doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollMissingWearables,this));
}
}