Applied RLVa-1.0.4e_20091010_SL-1.22.11-diff.patch

1 files changed, 50 insertions, 5 deletions

diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index f36989b..42d10b8 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -9,6 +9,15 @@
 #include "llwlparamset.h"
 #include "rlvdefines.h"
 
+#ifdef LL_WINDOWS
+        #pragma warning (push)
+        #pragma warning (disable : 4702) // warning C4702: unreachable code
+#endif
+#include <boost/variant.hpp>
+#ifdef LL_WINDOWS
+        #pragma warning (pop)
+#endif
+
 // ============================================================================
 // RlvCommand
 //
@@ -28,10 +37,12 @@ public:
         const std::string& getOption() const        { return m_strOption; }
         const std::string& getParam() const         { return m_strParam; }
         ERlvParamType      getParamType() const     { return m_eParamType; }
+        bool               isStrict() const                     { return m_fStrict; }
         bool               isValid() const          { return m_fValid; }
 
         static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr);
         static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
+        static bool               hasStrictVariant(ERlvBehaviour eBhvr);
 
         static void initLookupTable();
 protected:
@@ -50,6 +61,7 @@ protected:
         bool            m_fValid;
         std::string     m_strBehaviour;
         ERlvBehaviour   m_eBehaviour;
+        bool            m_fStrict;
         std::string     m_strOption;
         std::string     m_strParam;
         ERlvParamType   m_eParamType;
@@ -78,10 +90,8 @@ public:
         bool removeCommand(const RlvCommand& rlvCmd);
 
         std::string getStatusString(const std::string& strMatch) const;
-        bool        hasBehaviour(ERlvBehaviour eBehaviour) const;
-        bool        hasBehaviour(const std::string& strBehaviour) const;
-        bool        hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
-        bool        hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const;
+        bool        hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const;
+        bool        hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const;
 
         const rlv_command_list_t* getCommandList() const { return &m_Commands; }
 
@@ -190,6 +200,24 @@ private:
 typedef std::list<RlvRetainedCommand> rlv_retained_list_t;
 
 // ============================================================================
+// RlvException
+//
+
+typedef boost::variant<std::string, LLUUID, S32, ERlvBehaviour> RlvExceptionOption;
+
+struct RlvException
+{
+public:
+        LLUUID                          idObject;    // UUID of the object that added the exception
+        ERlvBehaviour           eBehaviour;  // Behaviour the exception applies to
+        RlvExceptionOption      varOption;   // Exception data (type is dependent on eBehaviour)
+
+        RlvException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& option) : idObject(idObj), eBehaviour(eBhvr), varOption(option) {}
+private:
+        RlvException();
+};
+
+// ============================================================================
 // RlvWLSnapshot
 //
 
@@ -225,7 +253,7 @@ public:
         static BOOL getDebug()                                  { return rlvGetSettingBOOL(RLV_SETTING_DEBUG, FALSE); }
         static BOOL getForbidGiveToRLV()                { return rlvGetSettingBOOL(RLV_SETTING_FORBIDGIVETORLV, TRUE); }
 
-        static BOOL getEnableWear()                             { return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, FALSE); }
+        static BOOL getEnableWear();
         static BOOL getHideLockedLayers()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDLAYER, FALSE); }               
         static BOOL getHideLockedAttach()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDATTACH, FALSE); }
         static BOOL getHideLockedInventory()    { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDINVENTORY, FALSE); }
@@ -290,6 +318,7 @@ struct RlvSelectIsSittingOn : public LLSelectedNodeFunctor
 
 BOOL rlvAttachToEnabler(void* pParam);
 bool rlvCanDeleteOrReturn();
+BOOL rlvEnableWearEnabler(void* pParam);
 S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
 bool rlvIsEmote(const std::string& strUTF8Text);
 bool rlvIsValidReplyChannel(S32 nChannel);
@@ -344,6 +373,22 @@ inline void RlvCurrentlyWorn::fetchItem(const LLUUID& idItem)
         }
 }
 
+inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
+{
+        switch (eBhvr)
+        {
+                case RLV_BHVR_RECVCHAT:
+                case RLV_BHVR_RECVEMOTE:
+                case RLV_BHVR_RECVIM:
+                case RLV_BHVR_SENDIM:
+                case RLV_BHVR_TPLURE:
+                case RLV_BHVR_SENDCHANNEL:
+                        return true;
+                default:
+                        return false;
+        }
+}
+
 // ============================================================================
 // Inlined helper functions
 //