summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-03-22 12:46:00 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2010-03-22 12:46:00 +0200
commit8e50d02e1b9c2a051009df9f8ecf058e1cdb325d (patch)
tree643669b40d6e72b8bdd4b8a5dffb44dc9e460362 /indra/newview/llappearancemgr.cpp
parent92f33c185efe196d9d15989e2dc833f8d6013159 (diff)
parent6e4f9b9073f735dd169f09f35811d14736b4cd0c (diff)
merge
--HG-- branch : product-engine
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 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;
}