Sync stuff

This commit is contained in:
Inusaito Sayori
2014-11-20 13:41:19 -05:00
parent 10a3339019
commit 9892d23735

View File

@@ -5850,8 +5850,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
// Forcing turning off flying here to prevent flying after pressing "Stand" // Forcing turning off flying here to prevent flying after pressing "Stand"
// to stand up from an object. See EXT-1655. // to stand up from an object. See EXT-1655.
// Unless the user wants to. // Unless the user wants to.
static LLCachedControl<bool> ContinueFlying("LiruContinueFlyingOnUnsit"); if (!gSavedSettings.getBOOL("LiruContinueFlyingOnUnsit"))
if (!ContinueFlying)
gAgent.setFlying(FALSE); gAgent.setFlying(FALSE);
LLViewerObject* object = gObjectList.findObject(sitObjectID); LLViewerObject* object = gObjectList.findObject(sitObjectID);