Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile Fixes

Browse Source 
Updates RLVHelper.
This commit is contained in:
Lirusaito
2016-05-26 12:46:04 -04:00
parent 4bfd4b38bc
commit cfea4f4ccf
7 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/rlvhelper.h
View File

@@ -53,7 +53,7 @@ public:
typedef std::map<std::string, ERlvBehaviour> bhvr_map_t;
static ERlvBehaviour getBehaviourFromString(const std::string& strBhvr, bool* pfStrict = NULL);
static bool getCommands(bhvr_map_t& cmdList, const std::string& strMatch);
static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
//static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr); // not implemented
static bool hasStrictVariant(ERlvBehaviour eBhvr);
static void initLookupTable();
@@ -313,7 +313,7 @@ private:
};
// ============================================================================
// RlvBehaviourNotifyHandler
// RlvBehaviourNotifyObserver
//
class RlvBehaviourNotifyHandler : public LLSingleton<RlvBehaviourNotifyHandler>
@@ -347,16 +347,15 @@ public:
/*
* Event handlers
*/
public:
//public:
static void onWear(LLWearableType::EType eType, bool fAllowed);
static void onTakeOff(LLWearableType::EType eType, bool fAllowed);
static void onAttach(const LLViewerJointAttachment* pAttachPt, bool fAllowed);
static void onDetach(const LLViewerJointAttachment* pAttachPt, bool fAllowed);
static void onReattach(const LLViewerJointAttachment* pAttachPt, bool fAllowed);
protected:
void onCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet, bool fInternal);
void onCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet, bool fInternal) const;
protected:
struct notifyData
{
S32 nChannel;
@@ -394,6 +393,7 @@ public:
virtual BOOL tick();
};
// NOTE: Unused as of SL-3.7.2
class RlvCallbackTimerOnce : public LLEventTimer
{
public:
@@ -409,6 +409,7 @@ protected:
nullary_func_t m_Callback;
};
// NOTE: Unused as of SL-3.7.2
inline void rlvCallbackTimerOnce(F32 nPeriod, RlvCallbackTimerOnce::nullary_func_t cb)
{
// Timer will automatically delete itself after the callback