diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 5d2535d043..8b09fd3e35 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -435,10 +435,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 e9019234ec..aab3890454 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 : public LLSingleton<RlvAttachmentLockWatchdog>
 {
-	LLSINGLETON(RlvAttachmentLockWatchdog);
+	LLSINGLETON_EMPTY_CTOR(RlvAttachmentLockWatchdog);
 protected:
 	~RlvAttachmentLockWatchdog() { delete m_pTimer; }
 
@@ -379,8 +379,6 @@ protected:
 	mutable uuid_vec_t       m_LockedAttachmentRem;
 	mutable folderlock_map_t m_LockedFolderMap;
 	mutable uuid_vec_t       m_LockedWearableRem;
-private:
-	friend class LLSingleton<RlvFolderLocks>;
 };
 
 // ============================================================================