summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
AgeCommit message (Collapse)Author
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-24Merge branch 'main' into marchcat/a-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llimage/llimage.cpp # indra/llui/llsearcheditor.cpp # indra/llui/llview.cpp # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llvovolume.cpp
2024-04-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llselectmgr.cpp # indra/newview/lltranslate.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp
2024-04-10Merge branch 'main' into marchcat/y-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp
2024-02-23Issue#880 Crash on a dead pointer in a chat sessionAndrey Kleshchev
2024-01-09Replace BOOST_FOREACH with standard C++ range-based for-loopsAnsariel
2023-08-22SL-20182 dirtyFilter crash while accessing parentAndrey Kleshchev
2022-09-08SL-3007 Report abuse option in paticipan listAndrey Kleshchev
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-01SL-15061 Crash deleting non-zero reference in LLConversationItemSessionAndrey Kleshchev
2021-03-26SL-14975 SL-14384 viewer crashes because of large chat groupsAndrey Kleshchev
1. Due to desync participant can be NULL - added NULL checks 2. With large backlog of events, closing and then opening a goup session was causing a crash due to obsolete events - added cleanup for backlog 3. In some cases events were accumulating faster than they were processed - ensured that after certain point event processing scales up with a backlog
2021-01-06SL-14270 Crash on participant's updateNameAndrey Kleshchev
Session was deleted before viewer had a chance to create view for listener, so listener ended up not deleted and avaiting an uptade, then tryed to call for deleted session.
2021-01-05SL-14074 Resolved potential cause of conversation crashesAndrey Kleshchev
Models (listeners) belong to folder-views, deleting all of them means that not only proper cleanup procedure won't be followed, and view might try clean dead pointer.
2020-04-28SL-13119 Duplicate check was causing slowdownsAndrey Kleshchev
2019-02-15SL-10351 Cleanupandreykproductengine
2019-02-11SL-10351 Fixed Avatars muted by Group moderator become Blocked foreverandreykproductengine
2019-02-11SL-10347 Fixed Users can't exchange text messages after moderator click on ↵andreykproductengine
"Mute everyone"
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-02MAINT-5345 FIXED Unable to end IM voice call using context menu.Mnikolenko ProductEngine
2014-07-14MAINT-4226 Group ban option is added to participant menu in Group chat.Mnikolenko ProductEngine
2013-11-06merge with releaseRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-05STORM-1838 Slowly reappling changes to work with CHUIJonathan Yap
2013-06-05CHUI-918 Don't show "Close Selected" item if Nearby chat is selectedMnikolenko ProductEngine
2013-06-04CHUI-918 FIXED Close only selected conversations instead of closing all ↵Mnikolenko ProductEngine
conversations.
2013-05-29CHUI-918 FIXED "Close all conversations" menu item is added to context menu.Mnikolenko ProductEngine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-04-23CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby ↵Mnikolenko ProductEngine
chat.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-14CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappearedCho
Added "Zoom In" context menu item to Nearby Chat list in People floater and Conversation floater
2013-02-27CHUI-788 FIXED Mute icon not shown in participant list in conversation floatermaksymsproductengine
2013-02-12CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute ↵Cho
this participant" Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-28CHUI-395 (Group moderators are not shown as Moderators in group conversation)mberezhnoy
2013-01-08CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-04Merge with viewer-chuiMerov Linden
2013-01-04CHUI-580 : Fixed : Avoid fetching names while reacting to display name ↵Merov Linden
checkbox change (overkill), make display name pref disabled when usePeopleAPI is off
2012-12-20CHUI-429 : Fixed! Add a flag to filter multi/single selection situations in ↵Merov Linden
menu building. Implement in conversation contextual menu.
2012-12-17CHUI-580 : WIP : Added disconnect of callbacks once they're called to ↵Merov Linden
prevent filling up the callback queue
2012-12-17CHUI-580 : WIP : Protect callback connections passed to ↵Merov Linden
LLAvatarNameCache::get() where necessary
2012-12-10CHUI-394 (Group moderation tools missing in right click menus)MaximB ProductEngine
2012-12-07CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the ↵Merov Linden
display of (waiting) when names don't come (mostly in legacy mode).
2012-12-05Pull merge from dev repoMerov Linden
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.