summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-16 10:19:37 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-16 10:19:37 -0400
commitba414d500ca8cb88da530c89ba373c95195ce633 (patch)
tree7101caf69a2d609d04f1352ad2f01c8d310e6228 /indra/newview/llappearancemgr.cpp
parent43f1abee2b7c8f2a1615ee98074b024156392dd9 (diff)
parent9bdf262d8511e84c2425e48a466b60f185516c76 (diff)
automated merge viewer2.0->viewe2.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 f6509a8016..f2d15757c9 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));
}
}