From 09235b016af5fcbf83fd196deb7577ccf2903d15 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 9 Oct 2021 21:11:35 -0400
Subject: [PATCH] Minor cleanup
---
indra/newview/rlvhelper.cpp | 3 ---
indra/newview/rlvhelper.h | 6 ++----
indra/newview/rlvlocks.cpp | 3 ---
indra/newview/rlvlocks.h | 4 +---
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index bfb00580869..667b300c9a3 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -1228,9 +1228,6 @@ void RlvObject::setModifierValue(ERlvLocalBhvrModifier eBhvrModifier, const RlvB
// RlvForceWear
//
-RlvForceWear::RlvForceWear()
-{
-}
// Checked: 2010-04-05 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d
bool RlvForceWear::isWearingItem(const LLInventoryItem* pItem)
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index a8696bc01ab..6aa83af1d8b 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -499,7 +499,8 @@ class RlvObject
class RlvForceWear final : public LLSingleton<RlvForceWear>
{
- LLSINGLETON(RlvForceWear);
+ LLSINGLETON_EMPTY_CTOR(RlvForceWear);
+
public:
// Folders
enum EWearAction { ACTION_WEAR_REPLACE, ACTION_WEAR_ADD, ACTION_REMOVE };
@@ -590,9 +591,6 @@ class RlvForceWear final : public LLSingleton<RlvForceWear>
typedef std::map<LLUUID, U8> pendingattachments_map_t;
pendingattachments_map_t m_pendingAttachments;
-
-private:
- friend class LLSingleton<RlvForceWear>;
};
// ============================================================================
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 5b022fe786d..cbbf4ff08f4 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -432,9 +432,6 @@ bool RlvAttachmentLocks::verifyAttachmentLocks()
// RlvAttachmentLockWatchdog member functions
//
-RlvAttachmentLockWatchdog::RlvAttachmentLockWatchdog()
-{
-}
// Checked: 2010-09-23 (RLVa-1.2.1d) | Added: RLVa-1.2.1d
bool RlvAttachmentLockWatchdog::RlvWearInfo::isAddLockedAttachPt(S32 idxAttachPt) const
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index bd605ddde14..983af119786 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -140,7 +140,7 @@ extern RlvAttachmentLocks gRlvAttachmentLocks;
// TODO-RLVa: [RLVa-1.2.1] This class really looks rather cluttered so look into cleaning it up/simplifying it a bit
class RlvAttachmentLockWatchdog final : public LLSingleton<RlvAttachmentLockWatchdog>
{
- LLSINGLETON(RlvAttachmentLockWatchdog);
+ LLSINGLETON_EMPTY_CTOR(RlvAttachmentLockWatchdog);
protected:
~RlvAttachmentLockWatchdog() { delete m_pTimer; }
@@ -379,8 +379,6 @@ class RlvFolderLocks final : public LLSingleton<RlvFolderLocks>
mutable uuid_vec_t m_LockedAttachmentRem;
mutable folderlock_map_t m_LockedFolderMap;
mutable uuid_vec_t m_LockedWearableRem;
-private:
- friend class LLSingleton<RlvFolderLocks>;
};
// ============================================================================
--
GitLab