diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 13:36:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 13:36:54 +0100 |
| commit | 2336188eeda9d074282886c610c918328e563fb7 (patch) | |
| tree | 9322c15ac2b7736c7a24660ac355d7bcc89167c7 /indra/newview/llviewermessage.cpp | |
| parent | 7d349bfde33e7882b0ddf79def10974330309c7f (diff) | |
| parent | ea6a3e8e7801425faa75fdd8a40b7990a58ee0d4 (diff) | |
merge from PE's viewer-hotfix
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3d0dfbed40..fab1d983c2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4169,6 +4169,9 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) } gAgent.setForceMouselook(force_mouselook); + // Forcing turning off flying here to prevent flying after pressing "Stand" + // to stand up from an object. See EXT-1655. + gAgent.setFlying(FALSE); LLViewerObject* object = gObjectList.findObject(sitObjectID); if (object) |