From ab352a55926f18e2dbf8ee4a31b2f28b6ca25a7b Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 28 Mar 2011 02:31:44 +0200 Subject: [PATCH] - changed : renamed unofficial @touchobj restriction to @touchthis --HG-- branch : RLVa --- indra/newview/rlvdefines.h | 2 +- indra/newview/rlvhandler.cpp | 10 ++-------- indra/newview/rlvhelper.cpp | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index f72046b05f..4d64cdb25d 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -177,7 +177,7 @@ enum ERlvBehaviour { RLV_BHVR_REZ, // "rez" RLV_BHVR_FARTOUCH, // "fartouch" RLV_BHVR_INTERACT, // "interact" - RLV_BHVR_TOUCHOBJ, // "touchobj" + RLV_BHVR_TOUCHTHIS, // "touchthis" RLV_BHVR_TOUCHATTACH, // "touchattach" RLV_BHVR_TOUCHATTACHSELF, // "touchattachself" RLV_BHVR_TOUCHATTACHOTHER, // "touchattachother" diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp index efd9d20eae..e4a34bf670 100644 --- a/indra/newview/rlvhandler.cpp +++ b/indra/newview/rlvhandler.cpp @@ -578,12 +578,8 @@ void RlvHandler::onTeleportFinished(const LLVector3d& posArrival) bool RlvHandler::canTouch(const LLViewerObject* pObj, const LLVector3& posOffset /*=LLVector3::zero*/) const { const LLUUID& idRoot = (pObj) ? pObj->getRootEdit()->getID() : LLUUID::null; -#ifdef RLV_EXTENSION_CMD_TOUCHXXX bool fCanTouch = (idRoot.notNull()) && ((!pObj->isHUDAttachment()) || (!hasBehaviour(RLV_BHVR_TOUCHALL))) && - ((!hasBehaviour(RLV_BHVR_TOUCHOBJ)) || (!isException(RLV_BHVR_TOUCHOBJ, idRoot, RLV_CHECK_PERMISSIVE))); -#else - bool fCanTouch = (idRoot.notNull()) && ((!pObj->isHUDAttachment()) || (!hasBehaviour(RLV_BHVR_TOUCHALL))); -#endif // RLV_EXTENSION_CMD_TOUCHXXX + ((!hasBehaviour(RLV_BHVR_TOUCHTHIS)) || (!isException(RLV_BHVR_TOUCHTHIS, idRoot, RLV_CHECK_PERMISSIVE))); if (fCanTouch) { @@ -1187,9 +1183,7 @@ ERlvCmdRet RlvHandler::processAddRemCommand(const RlvCommand& rlvCmd) case RLV_BHVR_SENDIMTO: // @sendimto:=n|y - Checked: 2010-11-30 (RLVa-1.3.0c) | Added: RLVa-1.3.0c case RLV_BHVR_RECVIMFROM: // @recvimfrom:=n|y - Checked: 2010-11-30 (RLVa-1.3.0c) | Added: RLVa-1.3.0c case RLV_BHVR_EDITOBJ: // @editobj:=n|y - Checked: 2010-11-29 (RLVa-1.3.0c) | Added: RLVa-1.3.0c -#ifdef RLV_EXTENSION_CMD_TOUCHXXX - case RLV_BHVR_TOUCHOBJ: // @touchobj:=n|y - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l -#endif // RLV_EXTENSION_CMD_TOUCHXXX + case RLV_BHVR_TOUCHTHIS: // @touchthis:=n|y - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l { // There should be an option and it should specify a valid UUID LLUUID idException(strOption); diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index 6bcc6e6cac..90f918e1a2 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -154,7 +154,7 @@ void RlvCommand::initLookupTable() "sendim", "sendimto", "recvim", "recvimfrom", "permissive", "notify", "showinv", "showminimap", "showworldmap", "showloc", "shownames", "showhovertext", "showhovertexthud", "showhovertextworld", "showhovertextall", "tplm", "tploc", "tplure", "viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "allowidle", - "displayname", "edit", "editobj", "rez", "fartouch", "interact", "touchobj", "touchattach", "touchattachself", + "displayname", "edit", "editobj", "rez", "fartouch", "interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", "touchall", "fly", "setgroup", "unsit", "sit", "sittp", "standtp", "setdebug", "setenv", "detachme", "attachover", "attachthis", "attachthisover", "detachthis", "attachall", "attachallover", "detachall", "attachallthis", "attachallthisover", "detachallthis", "tpto", "version", "versionnew",