diff options
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/rlvdefines.h | 2 | ||||
-rw-r--r-- | indra/newview/rlvhandler.cpp | 15 | ||||
-rw-r--r-- | indra/newview/rlvhelper.cpp | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index e39328fdd6..71550ac63f 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -93,6 +93,8 @@ namespace Rlv Version = 0, VersionNew, VersionNum, + Sit, + Unsit, GetCommand, Count, diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp index 63914064cf..3394362c93 100644 --- a/indra/newview/rlvhandler.cpp +++ b/indra/newview/rlvhandler.cpp @@ -30,6 +30,7 @@ #include "llstartup.h" #include "llviewercontrol.h" #include "llviewerobject.h" +#include "llviewermenu.h" #include "rlvcommon.h" #include "rlvhandler.h" @@ -230,4 +231,18 @@ ECmdRet CommandHandlerBaseImpl<EParamType::Force>::processCommand(const RlvComma return (*pHandler)(rlvCmd); } +template<> template<> +ECmdRet ForceHandler<EBehaviour::Sit>::onCommand(const RlvCommand& rlvCmd) +{ + handle_object_sit(LLUUID{rlvCmd.getOption()}); + return ECmdRet::Succeeded; +} + +template<> template<> +ECmdRet ForceHandler<EBehaviour::Unsit>::onCommand(const RlvCommand& rlvCmd) +{ + gAgent.standUp(); + return ECmdRet::Succeeded; +} + // ============================================================================ diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 7cb1473c8c..a0a98d796e 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -54,6 +54,10 @@ BehaviourDictionary::BehaviourDictionary() addEntry(new ReplyProcessor<EBehaviour::VersionNew, VersionReplyHandler>("versionnew")); addEntry(new ReplyProcessor<EBehaviour::VersionNum>("versionnum")); + // Force + addEntry(new ForceProcessor<EBehaviour::Sit>("sit")); + addEntry(new ForceProcessor<EBehaviour::Unsit>("unsit")); + // Populate mString2InfoMap (the tuple <behaviour, type> should be unique) for (const BehaviourInfo* bhvr_info_p : mBhvrInfoList) { |