From 8005a58ed5d6758965e530ca9eab6a099c4e4321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sat, 11 Jan 2020 21:53:29 -0500 Subject: [PATCH] Script Counting on an avatar now shows their SLURL, instead of just a name --- indra/newview/scriptcounter.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/indra/newview/scriptcounter.cpp b/indra/newview/scriptcounter.cpp index b29527794..2004e8cff 100644 --- a/indra/newview/scriptcounter.cpp +++ b/indra/newview/scriptcounter.cpp @@ -33,6 +33,7 @@ #include "scriptcounter.h" +#include "llavataractions.h" #include "llavatarnamecache.h" #include "llviewerregion.h" #include "llselectmgr.h" @@ -44,15 +45,6 @@ void cmdline_printchat(const std::string& message); LLVOAvatar* find_avatar_from_object( LLViewerObject* object ); -namespace -{ - void countedScriptsOnAvatar(LLStringUtil::format_map_t args, const LLAvatarName& av_name) - { - args["NAME"] = av_name.getNSName(); - cmdline_printchat(LLTrans::getString("ScriptCountAvatar", args)); - } -} - std::map ScriptCounter::sCheckMap; ScriptCounter::ScriptCounter(bool do_delete, LLViewerObject* object) @@ -197,7 +189,10 @@ void ScriptCounter::summarize() args["RUNNING"] = stringize(mRunningCount); args["MONO"] = stringize(mMonoCount); if (foo->isAvatar()) - LLAvatarNameCache::get(foo->getID(), boost::bind(countedScriptsOnAvatar, args, _2)); + { + args["NAME"] = LLAvatarActions::getSLURL(foo->getID()); + cmdline_printchat(LLTrans::getString("ScriptCountAvatar", args)); + } else cmdline_printchat(LLTrans::getString(doDelete ? "ScriptDeleteObject" : "ScriptCountObject", args));