diff --git a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt index 9495c0dd27..11e5ee0ce5 100644 --- a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt +++ b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt @@ -7,7 +7,7 @@ // // Bridge platform - string BRIDGE_VERSION = "2.26"; // This should match fslslbridge.cpp + string BRIDGE_VERSION = "2.27"; // This should match fslslbridge.cpp string gLatestURL; integer gViewerIsFirestorm; integer gTryHandshakeOnce = TRUE; @@ -459,7 +459,10 @@ default { gUseMoveLock = llList2Integer(commandList, 1); movelockMe(gUseMoveLock); - llOwnerSay(""); + if (llList2String(commandList, 2) != "noreport") + { + llOwnerSay(""); + } } else if (cmd == "llMoveToTarget") diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 60c48e3ff5..e8596296cb 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -55,7 +55,7 @@ static const std::string FS_BRIDGE_FOLDER = "#LSL Bridge"; static const std::string FS_BRIDGE_CONTAINER_FOLDER = "Landscaping"; static const U32 FS_BRIDGE_MAJOR_VERSION = 2; -static const U32 FS_BRIDGE_MINOR_VERSION = 26; +static const U32 FS_BRIDGE_MINOR_VERSION = 27; static const U32 FS_MAX_MINOR_VERSION = 99; static const std::string UPLOAD_SCRIPT_CURRENT = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt"; static const std::string FS_STATE_ATTRIBUTE = "state="; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9ea5cfef74..6aeeb2019a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -131,6 +131,7 @@ #include "llviewernetwork.h" // [FS:CR] isInSecondlife() #include "llsidepanelappearance.h" #include "fsavatarrenderpersistence.h" +#include "fslslbridge.h" // Movelock position refresh #include "fsdiscordconnect.h" // tapping a place that happens on landing in world to start up discord @@ -8235,6 +8236,13 @@ void LLVOAvatar::sitDown(BOOL bSitting) gRlvHandler.onSitOrStand(bSitting); } // [/RLVa:KB] + + // Refresh movelock position after sitting down to prevent pulling avatar back to previous one after standing up + if (bSitting && gSavedPerAccountSettings.getBOOL("UseMoveLock") && gSavedPerAccountSettings.getBOOL("RelockMoveLockAfterMovement")) + { + FSLSLBridge::instance().viewerToLSL("UseMoveLock|1|noreport"); + } + // } }