summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-19 14:22:40 -0700
committerRichard Nelson <none@none>2010-03-19 14:22:40 -0700
commit8992f058e077a78d091c864619d9d740dc305094 (patch)
tree7d77fbc4451a4eb8b211292a44b8003cb51fdf01 /indra/newview/llappearancemgr.cpp
parentfd096e5011c8d777f54c7fe473b12e6730dbedc0 (diff)
parentf50be64167c254e27f635ad47d8940551f0c6ab4 (diff)
merge
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;
}