diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:26:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:26:08 +0100 |
| commit | 47c8cb4891adc74f928f7712f79d7d1032bea567 (patch) | |
| tree | 1669484c4e69ee476ed27d3fd999fd93a54bfad2 /indra/newview/llviewermessage.cpp | |
| parent | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (diff) | |
| parent | 532d732645f2369d17eba9c2ed0d594b486d416e (diff) | |
merge from viewer-trunk
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 e0c327068c..1fcbbd7fd4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4430,6 +4430,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) |