summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 11:52:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 11:52:19 -0400
commitab83fab72c66e753917001a9030aa55e69a3c496 (patch)
treed71c42801e3083b316986c8005cf69a331bf558a /indra/newview/llvoavatar.cpp
parent04b0862b3b53ef57801b779c51e6b8fe1c442008 (diff)
error checking, comments for areas needing fix/check in appearance
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 1676f656d3..0f18aa358c 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4203,8 +4203,15 @@ void LLVOAvatar::setTexEntry(const U8 index, const LLTextureEntry &te)
const std::string LLVOAvatar::getImageURL(const U8 te, const LLUUID &uuid)
{
std::string url = "";
- if (isUsingServerBakes() && !gSavedSettings.getString("AgentAppearanceServiceURL").empty())
+ if (isUsingServerBakes())
{
+ if (gSavedSettings.getString("AgentAppearanceServiceURL").empty())
+ {
+ // Probably a server-side issue if we get here:
+ llwarns << "AgentAppearanceServiceURL not set - Baked texture requests will fail" << llendl;
+ return url;
+ }
+
const LLAvatarAppearanceDictionary::TextureEntry* texture_entry = LLAvatarAppearanceDictionary::getInstance()->getTexture((ETextureIndex)te);
if (texture_entry != NULL)
{