diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-20 14:48:00 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-20 14:48:00 -0700 |
| commit | 5fab3253f941c0e25b4b86e29ab7a34c4325f825 (patch) | |
| tree | 8c79b64a284d18a2e316ee3fc881629dff35617d /indra/newview/llvoavatar.cpp | |
| parent | ab320a12e62152907bbec150972a9ac8a0e244fb (diff) | |
| parent | cde71ddc88293a752787b710f6d03aba1ec0b15e (diff) | |
Merge from dessie/viewer-release
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 06a0e854bc..c451b7901a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3278,14 +3278,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); } |