diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
| commit | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch) | |
| tree | af7409521b24318b7c48a7434824178888c17a3e /indra/newview/llvoavatar.cpp | |
| parent | 0009346667872b90d39089c3800ab3e00ce73b51 (diff) | |
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index efcd36af0a..b21df05afe 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2988,14 +2988,24 @@ void LLVOAvatar::updateCharacter(LLAgent &agent) { if (motionp->getMinPixelArea() < getPixelArea()) { - char output[256]; /* Flawfinder: ignore */ + char output[MAX_STRING]; /* Flawfinder: ignore */ if (motionp->getName().empty()) { - snprintf(output, sizeof(output), "%s - %d", motionp->getID().getString().c_str(), (U32)motionp->getPriority()); /* Flawfinder: ignore */ + snprintf( /* Flawfinder: ignore */ + output, + MAX_STRING, + "%s - %d", + motionp->getID().asString().c_str(), + (U32)motionp->getPriority()); } else { - snprintf(output, sizeof(output), "%s - %d", motionp->getName().c_str(), (U32)motionp->getPriority()); /* Flawfinder: ignore */ + snprintf( /* Flawfinder: ignore */ + output, + MAX_STRING, + "%s - %d", + motionp->getName().c_str(), + (U32)motionp->getPriority()); } addDebugText(output); } @@ -3948,9 +3958,10 @@ void LLVOAvatar::updateTextures(LLAgent &agent) && imagep->getID() != IMG_DEFAULT_AVATAR && !imagep->getTargetHost().isOk()) { - llwarns << "LLVOAvatar::updateTextures No host for texture " << imagep->getID() - << " for avatar " << (mIsSelf ? "<myself>" : getID().getString()) - << " on host " << getRegion()->getHost() << llendl; + llwarns << "LLVOAvatar::updateTextures No host for texture " + << imagep->getID() << " for avatar " + << (mIsSelf ? "<myself>" : getID().asString().c_str()) + << " on host " << getRegion()->getHost() << llendl; } switch( i ) |