diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-26 16:32:38 +0200 |
commit | 35b5b5e2a3dceaf98fdf770d971c45b1c80116ed (patch) | |
tree | 3f34f5deff668a9a0001f79560b3823dd48d6f49 /indra/newview/llappearancemgr.cpp | |
parent | e962b8418f8a37c1d18743c31199dd9c33d5c74b (diff) | |
parent | 379517ce5e1535b20a94ef3a581e1b25223f8798 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-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 f2d15757c9..b3dfb8f141 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -399,7 +399,7 @@ bool LLWearableHoldingPattern::isFetchCompleted() bool LLWearableHoldingPattern::isTimedOut() { - static F32 max_wait_time = 20.0; // give up if wearable fetches haven't completed in max_wait_time seconds. + static F32 max_wait_time = 60.0; // give up if wearable fetches haven't completed in max_wait_time seconds. return mWaitTime.getElapsedTimeF32() > max_wait_time; } |