summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2022-12-12 17:59:34 -0800
committerBrad Linden <brad@lindenlab.com>2022-12-12 17:59:34 -0800
commiteb526fec0aadcaf30363fdfb1e253a609bf83acc (patch)
tree6071628f41ca793007b645aa30d255044ddbfe43 /indra/newview/llviewermenu.cpp
parentc9c611fd12f55ac6d6717ba17139ba61a6db581f (diff)
parenta0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8d0dd505bf..4ba4c5f935 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4314,6 +4314,10 @@ class LLLandSit : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
+ if (gAgent.isSitting())
+ {
+ gAgent.standUp();
+ }
LLVector3d posGlobal = LLToolPie::getInstance()->getPick().mPosGlobal;
LLQuaternion target_rot;