summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-02-15 15:11:35 -0500
committerNat Goodspeed <nat@lindenlab.com>2023-02-15 15:11:35 -0500
commitaec39a0f9f7f16a7970e96bad552ca684af57e3f (patch)
tree742bfd7fee6d2cf98a9a93b5fc3d17ff2ca6557c /indra/newview/llviewermenu.cpp
parent6ef3df54b3ff0dcfed3000819209a7633e53a32b (diff)
parent23a3da37a91ea80311b5820c48a12d56b989f69d (diff)
SL-18330: Merge branch 'contribute' into sl-18330-merge
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 3573af40cb..c796ed30f7 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4334,6 +4334,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;