diff options
| author | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 12:20:47 -0700 |
| commit | 00e4fb0ac8431bda3705c218a548557cfca7e749 (patch) | |
| tree | dd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/newview/llvoavatar.cpp | |
| parent | 657e462b6a46bee09fe91e84ea37763db79c868c (diff) | |
| parent | bd897431e14aff091d5f45425816ddec4b2538c7 (diff) | |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6e1a9c61e6..298ac28ca8 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3133,14 +3133,16 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) if (motionp->getName().empty()) { output = llformat("%s - %d", - motionp->getID().asString().c_str(), - (U32)motionp->getPriority()); + gAgent.isGodlikeWithoutAdminMenuFakery() ? + motionp->getID().asString().c_str() : + LLUUID::null.asString().c_str(), + (U32)motionp->getPriority()); } else { output = llformat("%s - %d", - motionp->getName().c_str(), - (U32)motionp->getPriority()); + motionp->getName().c_str(), + (U32)motionp->getPriority()); } addDebugText(output); } |