diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:22:05 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:22:05 +0100 |
commit | 532d732645f2369d17eba9c2ed0d594b486d416e (patch) | |
tree | da6d4ab55e646420c54d277e9298434125122739 /indra/newview/llviewermessage.cpp | |
parent | fbc2064962e72a3ab9232c8a1b939c6a290027bf (diff) | |
parent | 2336188eeda9d074282886c610c918328e563fb7 (diff) |
merge from 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 360c6be2c6..c8a4b27f40 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4428,6 +4428,9 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) } gAgentCamera.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) |