From 3994101549eddf84d6c73982109f68d016a819ba Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 21 Sep 2022 20:52:27 +0100
Subject: [PATCH] SL-18119 - more ViewerStats logs for NUX
---
indra/newview/llagent.cpp | 4 ++++
indra/newview/llappearancemgr.cpp | 4 ++++
indra/newview/llavataractions.cpp | 2 +-
indra/newview/llcallingcard.cpp | 2 +-
indra/newview/lltoolpie.cpp | 3 +++
indra/newview/llviewermessage.cpp | 4 ++--
indra/newview/llvoiceclient.cpp | 4 ++++
7 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7f6f6e59974..3b3eadada7d 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -96,6 +96,7 @@
#include "stringize.h"
#include "boost/foreach.hpp"
#include "llcorehttputil.h"
+#include "lluiusage.h"
using namespace LLAvatarAppearanceDefines;
@@ -574,6 +575,8 @@ void LLAgent::ageChat()
//-----------------------------------------------------------------------------
void LLAgent::moveAt(S32 direction, bool reset)
{
+ LLUIUsage::instance().logCommand("Agent.MoveAt");
+
mMoveTimer.reset();
LLFirstUse::notMoving(false);
@@ -4023,6 +4026,7 @@ void LLAgent::startTeleportRequest()
}
if (hasPendingTeleportRequest())
{
+ LLUIUsage::instance().logCommand("Agent.StartTeleportRequest");
mTeleportCanceled.reset();
if (!isMaturityPreferenceSyncedWithServer())
{
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 39348412e51..909f32cd21a 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3973,6 +3973,8 @@ void LLAppearanceMgr::makeNewOutfitLinks(const std::string& new_folder_name, boo
{
if (!isAgentAvatarValid()) return;
+ LLUIUsage::instance().logCommand("Avatar.CreateNewOutfit");
+
LL_DEBUGS("Avatar") << "creating new outfit" << LL_ENDL;
gAgentWearables.notifyLoadingStarted();
@@ -4493,6 +4495,8 @@ class LLWearFolderHandler : public LLCommandHandler
"Quick Appearance");
if ( gInventory.getCategory( folder_uuid ) != NULL )
{
+ // Assume this is coming from the predefined avatars web floater
+ LLUIUsage::instance().logCommand("Avatar.WearPredefinedAppearance");
LLAppearanceMgr::getInstance()->wearInventoryCategory(category, true, false);
// *TODOw: This may not be necessary if initial outfit is chosen already -- josh
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 93370ba9c39..3e450e6dec1 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -1419,7 +1419,7 @@ bool LLAvatarActions::handleUnfreeze(const LLSD& notification, const LLSD& respo
void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message)
{
const LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD);
- LLUIUsage::instance().logCommand("Avatar.SendFriendRequest");
+ LLUIUsage::instance().logCommand("Agent.SendFriendRequest");
send_improved_im(target_id,
target_name,
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 7d7c8ba0cd4..1ad2157df04 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -295,7 +295,7 @@ void LLAvatarTracker::copyBuddyList(buddy_map_t& buddies) const
void LLAvatarTracker::terminateBuddy(const LLUUID& id)
{
LL_DEBUGS() << "LLAvatarTracker::terminateBuddy()" << LL_ENDL;
- LLUIUsage::instance().logCommand("Avatar.TerminateFriendship");
+ LLUIUsage::instance().logCommand("Agent.TerminateFriendship");
LLRelationship* buddy = get_ptr_in_map(mBuddyInfo, id);
if(!buddy) return;
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 43deac60d92..5fb83bf08e4 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -71,6 +71,7 @@
#include "llui.h"
#include "llweb.h"
#include "pipeline.h" // setHighlightObject
+#include "lluiusage.h"
extern BOOL gDebugClicks;
@@ -568,6 +569,8 @@ bool LLToolPie::walkToClickedLocation()
return false;
}
+ LLUIUsage::instance().logCommand("Agent.WalkToClickedLocation");
+
LLPickInfo saved_pick = mPick;
if (gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK)
{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 10710ae5f3a..c8b517b4c1b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -262,7 +262,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
{
case 0:
{
- LLUIUsage::instance().logCommand("Avatar.AcceptFriendship");
+ LLUIUsage::instance().logCommand("Agent.AcceptFriendship");
// accept
LLAvatarTracker::formFriendship(payload["from_id"]);
@@ -305,7 +305,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
// fall-through
case 2: // Send IM - decline and start IM session
{
- LLUIUsage::instance().logCommand("Avatar.DeclineFriendship");
+ LLUIUsage::instance().logCommand("Agent.DeclineFriendship");
// decline
// We no longer notify other viewers, but we DO still send
// the rejection to the simulator to delete the pending userop.
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index e2bd1a39c7f..8261fc7fb45 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -602,6 +602,10 @@ void LLVoiceClient::setMuteMic(bool muted)
void LLVoiceClient::setUserPTTState(bool ptt)
{
+ if (ptt)
+ {
+ LLUIUsage::instance().logCommand("Agent.EnableMicrophone");
+ }
mUserPTTState = ptt;
updateMicMuteLogic();
mMicroChangedSignal();
--
GitLab