aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-04-05 12:08:08 +0200
committerArmin Weatherwax2010-04-12 17:11:06 +0200
commit2bef4f471d91475e21dd4494db622c4d376283ea (patch)
tree825911431021bcd496056a29e9f0a5c6bab10c77 /linden/indra/newview/llvoavatar.cpp
parentsupport more OpenSim limits (number of groups, hollow size) (diff)
downloadmeta-impy-2bef4f471d91475e21dd4494db622c4d376283ea.zip
meta-impy-2bef4f471d91475e21dd4494db622c4d376283ea.tar.gz
meta-impy-2bef4f471d91475e21dd4494db622c4d376283ea.tar.bz2
meta-impy-2bef4f471d91475e21dd4494db622c4d376283ea.tar.xz
fix: don't try in vain to fetch a texture from a host not responding.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3055c92..868a6f8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2526,15 +2526,15 @@ S32 LLVOAvatar::setTETexture(const U8 te, const LLUUID& uuid)
2526{ 2526{
2527 // The core setTETexture() method requests images, so we need 2527 // The core setTETexture() method requests images, so we need
2528 // to redirect certain avatar texture requests to different sims. 2528 // to redirect certain avatar texture requests to different sims.
2529 /* if (isIndexBakedTexture((ETextureIndex)te)) 2529 if (isIndexBakedTexture((ETextureIndex)te))
2530 {*/ 2530 {
2531 LLHost target_host = getObjectHost(); 2531 LLHost target_host = getObjectHost();
2532 return setTETextureCore(te, uuid, target_host); 2532 return setTETextureCore(te, uuid, target_host);
2533 /*} 2533 }
2534 else 2534 else
2535 { 2535 {
2536 return setTETextureCore(te, uuid, LLHost::invalid); 2536 return setTETextureCore(te, uuid, LLHost::invalid);
2537 }*/ 2537 }
2538} 2538}
2539 2539
2540 2540