diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-06 15:13:10 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-06 15:13:10 +0100 |
| commit | 52138b24c509667c217b91ee17972b74e797bf4a (patch) | |
| tree | bb0cb13747f82a1a94c892ab42042fef4e8fce64 /indra/newview | |
| parent | cb1744dae641e3bbab13e88312f1df0e8f5af2b4 (diff) | |
| parent | 0a3493db0804ae71ccff2155847ed40089627d7b (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview')
| -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); } |