diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
| commit | 7f0a7789903809d489e9f85575be18c88df1ea98 (patch) | |
| tree | 1aa3428c097ef8e19f1e518eb2e3e6996d16a2bc /indra/newview/llviewermessage.cpp | |
| parent | aa5e494e0cf1242dcd35725576667ab1a935363a (diff) | |
| parent | 1c352ebb5bfda6d53c844dca130302b79b918796 (diff) | |
merge
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) |