Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync stuff

Browse Source
This commit is contained in:
Inusaito Sayori
2014-11-20 13:41:19 -05:00
parent 10a3339019
commit 9892d23735
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewermessage.cpp
View File

@@ -2262,7 +2262,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
BOOL accept_im_from_only_friend = gSavedSettings.getBOOL("InstantMessagesFriendsOnly"); BOOL accept_im_from_only_friend = gSavedSettings.getBOOL("InstantMessagesFriendsOnly");
LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id); LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
chat.mMuted = is_muted && !is_linden; chat.mMuted = is_muted && !is_linden;
chat.mFromID = from_id; chat.mFromID = from_id;
chat.mFromName = name; chat.mFromName = name;
@@ -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);