diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-11 15:24:31 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-11 15:24:31 -0800 |
| commit | a158cdb133f923e5d94c74a9240d8634d9718a08 (patch) | |
| tree | 2731b396fd74d905be2e47a0148fbd928ae6fdfc /indra/newview | |
| parent | 26df477d5100f1f2263b4ec2149b13e19e0d8334 (diff) | |
| parent | b3a8f8d714aba97f2d3d8a16db182f7328cf9d20 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
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)); } } |