diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h index d8833d0f556b1032ce2a26e99d80818c59c1805b..18d901310bee83676a2ff8bf1f5123cfb0e07b70 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 197f597d175b57dd1db71412254eec01d027317d..5a8e277a18b73dc5c2e1b57df59aa53ebb007fdc 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); } }