From 0e763a7eeaec071fc5a3ab35511b1f81079c6ef4 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Mon, 30 Aug 2010 14:35:29 +0200
Subject: [PATCH] - internal : there's no longer any need/use for the
 RlvRetainedCommand class

--HG--
branch : RLVa
---
 indra/newview/rlvhandler.cpp | 10 +++++-----
 indra/newview/rlvhandler.h   |  4 ++--
 indra/newview/rlvhelper.h    | 16 ----------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 4ae46cde15..e220c5a610 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -297,16 +297,16 @@ ERlvCmdRet RlvHandler::processCommand(const RlvCommand& rlvCmd, bool fFromObj)
 // Checked: 2010-02-27 (RLVa-1.2.0a) | Modified: RLVa-1.1.0f
 void RlvHandler::processRetainedCommands(ERlvBehaviour eBhvrFilter /*=RLV_BHVR_UNKNOWN*/, ERlvParamType eTypeFilter /*=RLV_TYPE_UNKNOWN*/)
 {
-	rlv_retained_list_t::iterator itCmd = m_Retained.begin(), itCurCmd;
+	rlv_command_list_t::iterator itCmd = m_Retained.begin(), itCurCmd;
 	while (itCmd != m_Retained.end())
 	{
 		itCurCmd = itCmd++;  // Point the loop iterator ahead
 
-		const RlvRetainedCommand& cmd = *itCurCmd;
-		if ( ((RLV_BHVR_UNKNOWN == eBhvrFilter) || (cmd.rlvCmd.getBehaviourType() == eBhvrFilter)) && 
-		     ((RLV_TYPE_UNKNOWN == eTypeFilter) || (cmd.rlvCmd.getParamType() == eTypeFilter)) )
+		const RlvCommand& rlvCmd = *itCurCmd;
+		if ( ((RLV_BHVR_UNKNOWN == eBhvrFilter) || (rlvCmd.getBehaviourType() == eBhvrFilter)) && 
+		     ((RLV_TYPE_UNKNOWN == eTypeFilter) || (rlvCmd.getParamType() == eTypeFilter)) )
 		{
-			processCommand(cmd.rlvCmd, true);
+			processCommand(rlvCmd, true);
 			m_Retained.erase(itCurCmd);
 		}
 	}
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index 98a11551a9..4447219cb3 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -188,7 +188,7 @@ protected:
 	rlv_exception_map_t   m_Exceptions;				// Map of currently active restriction exceptions (ERlvBehaviour -> RlvException)
 	S16                   m_Behaviours[RLV_BHVR_COUNT];
 
-	rlv_retained_list_t   m_Retained;
+	rlv_command_list_t    m_Retained;
 	RlvGCTimer*           m_pGCTimer;
 	RlvWLSnapshot*        m_pWLSnapshot;
 
@@ -346,7 +346,7 @@ inline ERlvCmdRet RlvHandler::processCommand(const LLUUID& idObj, const std::str
 {
 	if (STATE_STARTED != LLStartUp::getStartupState())
 	{
-		m_Retained.push_back(RlvRetainedCommand(idObj, RlvCommand(idObj, strCommand)));
+		m_Retained.push_back(RlvCommand(idObj, strCommand));
 		return RLV_RET_RETAINED;
 	}
 	return processCommand(RlvCommand(idObj, strCommand), fFromObj);
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 93d7a79668..0839dd2401 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -322,22 +322,6 @@ protected:
 	boost::signals2::connection m_ConnCommand;
 };
 
-// ============================================================================
-// RlvRetainedCommand
-//
-
-struct RlvRetainedCommand
-{
-public:
-	LLUUID      idObject;
-	RlvCommand  rlvCmd;
-
-	RlvRetainedCommand(const LLUUID& uuid, const RlvCommand& cmd) : idObject(uuid), rlvCmd(cmd) {}
-private:
-	RlvRetainedCommand();
-};
-typedef std::list<RlvRetainedCommand> rlv_retained_list_t;
-
 // ============================================================================
 // RlvException
 //