diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:41:02 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:41:02 +0300 |
| commit | b5df08724acf103be44436db8cc5689275ba60d0 (patch) | |
| tree | 0924c4765c72675c42d369715f136ee286f3cb9d /indra/newview/llvoavatar.cpp | |
| parent | ed5212f0e9795f00cbed9e674b58c53059605e64 (diff) | |
| parent | 4db872e11ea5d322c20de9ddde484cb39690c1a2 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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); } |