From 412c0010edf15e1ec7d43e43fdbd36d23bdff3a9 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 12 Mar 2021 15:29:43 -0500
Subject: [PATCH] Trivial cleanup
---
indra/newview/llfriendcard.h | 2 --
indra/newview/llgesturemgr.cpp | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index d8833d0f556..18d901310be 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -44,8 +44,6 @@ class LLFriendCardsManager final
friend class CreateFriendCardCallback;
public:
- typedef std::map<LLUUID, uuid_vec_t > folderid_buddies_map_t;
-
enum EManagerState
{
INIT = 1,
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 197f597d175..5a8e277a18b 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -1173,7 +1173,7 @@ void LLGestureMgr::onLoadComplete(const LLUUID& asset_uuid,
LL_WARNS() << "Problem loading gesture: " << status << LL_ENDL;
- LLGestureMgr::instance().mActive.erase(item_id);
+ self.mActive.erase(item_id);
}
}
--
GitLab