livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/llpanelpeople.cpp
master
Ansariel 2024-08-16 13:16:46 +02:00
parent 6473ba38bf 2a81ebba53
commit 2f8cb63ddf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanelpeople.cpp
View File

@ -622,13 +622,13 @@ LLPanelPeople::~LLPanelPeople()
delete mFriendListUpdater;
delete mRecentListUpdater;
LLVoiceClient::removeObserver(this);
mNearbyFilterCommitConnection.disconnect();
mFriedsFilterCommitConnection.disconnect();
mGroupsFilterCommitConnection.disconnect();
mRecentFilterCommitConnection.disconnect();
LLVoiceClient::getInstance()->removeObserver(this);
// [FS:CR] Contact sets
if (mContactSetChangedConnection.connected())
mContactSetChangedConnection.disconnect();