livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- internal : there's no longer any need/use for the RlvRetainedCommand class 

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2010-08-30 14:35:29 +02:00
parent 86102778c1
commit 0e763a7eea
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/rlvhandler.cpp
View File

@ -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);
}
}

4
indra/newview/rlvhandler.h
View File

@ -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);

16
indra/newview/rlvhelper.h
View File

@ -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
//