diff options
author | David Seikel | 2011-06-06 01:13:37 +1000 |
---|---|---|
committer | David Seikel | 2011-06-06 01:13:37 +1000 |
commit | 806656ad6c46d89e7a148f54b64df5100ddc3882 (patch) | |
tree | af2f04168e5aa1ec355a265a734296354d0a3a9b /linden/indra/newview/llvoavatar.cpp | |
parent | Merge branch 'next' of git://github.com/jacek/imprudence into next (diff) | |
download | meta-impy-806656ad6c46d89e7a148f54b64df5100ddc3882.zip meta-impy-806656ad6c46d89e7a148f54b64df5100ddc3882.tar.gz meta-impy-806656ad6c46d89e7a148f54b64df5100ddc3882.tar.bz2 meta-impy-806656ad6c46d89e7a148f54b64df5100ddc3882.tar.xz |
Changing the deruth log messages to warns, coz they really are.
Plus, meta-impy default log level is warn, and we want to see them.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 5c537a8..737f839 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -7533,7 +7533,7 @@ void LLVOAvatar::updateRuthTimer(bool loading) | |||
7533 | const F32 LOADING_TIMEOUT__SECONDS = 90.f; | 7533 | const F32 LOADING_TIMEOUT__SECONDS = 90.f; |
7534 | if (mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT__SECONDS) | 7534 | if (mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT__SECONDS) |
7535 | { | 7535 | { |
7536 | llinfos << "Ruth Timer timeout: Missing texture data for '" << getFullname() << "' " | 7536 | llwarns << "Ruth Timer timeout: Missing texture data for '" << getFullname() << "' " |
7537 | << "( Params loaded : " << !visualParamWeightsAreDefault() << " ) " | 7537 | << "( Params loaded : " << !visualParamWeightsAreDefault() << " ) " |
7538 | << "( Lower : " << isTextureDefined(TEX_LOWER_BAKED) << " ) " | 7538 | << "( Lower : " << isTextureDefined(TEX_LOWER_BAKED) << " ) " |
7539 | << "( Upper : " << isTextureDefined(TEX_UPPER_BAKED) << " ) " | 7539 | << "( Upper : " << isTextureDefined(TEX_UPPER_BAKED) << " ) " |
@@ -8860,7 +8860,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) | |||
8860 | if (visualParamWeightsAreDefault() && mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT_SECONDS) | 8860 | if (visualParamWeightsAreDefault() && mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT_SECONDS) |
8861 | { | 8861 | { |
8862 | // re-request appearance, hoping that it comes back with a shape next time | 8862 | // re-request appearance, hoping that it comes back with a shape next time |
8863 | llinfos << "Re-requesting AvatarAppearance for object: " << getID() << llendl; | 8863 | llwarns << "Re-requesting AvatarAppearance for object: " << getID() << llendl; |
8864 | //LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID()); | 8864 | //LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID()); |
8865 | std::vector<std::string> strings; | 8865 | std::vector<std::string> strings; |
8866 | strings.push_back(getID().asString()); | 8866 | strings.push_back(getID().asString()); |
@@ -8869,7 +8869,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) | |||
8869 | } | 8869 | } |
8870 | else | 8870 | else |
8871 | { | 8871 | { |
8872 | llinfos << "That's okay, we already have a non-default shape for object: " << getID() << llendl; | 8872 | llwarns << "That's okay, we already have a non-default shape for object: " << getID() << llendl; |
8873 | // we don't really care. | 8873 | // we don't really care. |
8874 | } | 8874 | } |
8875 | } | 8875 | } |