summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.h
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-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
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-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.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-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-12miscellaneous: BOOL (int) to real boolLars Næsbye Christensen
2023-12-18Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llpanelprofile.cpp # indra/newview/llspatialpartition.cpp
2023-12-14Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/newview/llspatialpartition.cpp
2023-10-17SL-20232 Allow deletion of worn items #1Andrey Kleshchev
2023-10-03Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml
2023-10-03Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp
2023-08-22SL-20182 dirtyFilter crash while accessing parentAndrey Kleshchev
2023-07-11SL-19986 Crash at LLConversationItemSession::findParticipantAndrey Kleshchev
Observed on bugsplat, no repro. Something destroys LLConversationItem without cleaning list (some sessions reuse the item, but they aren't supposed to remove it). Either item should inform floater to be properly removed or should be stored as an LLPointer.
2023-04-04SL-19273 Show empty folder message for empty folders regardless of filter stateMaxim Nikolenko
2023-02-27SL-19274 Add new double-click option to Inventory settingsMaxim Nikolenko
2023-02-24SL-19234 add Inventory settings floaterMaxim Nikolenko
2023-02-17SL-19105 WIP Single-folder inventory viewMaxim Nikolenko
2022-07-09SL-17741 Paste is not disabled when copying 'no copy' itemsAndrey Kleshchev
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case Also fixed library items enabling 'paste as link', we can not link library items.
2021-04-01SL-15061 Crash deleting non-zero reference in LLConversationItemSessionAndrey Kleshchev
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.
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
2017-08-04SL-717 Additional search options for inventory windowMnikolenko Productengine
2015-03-16Merge lindenlab/viewer-tools-updateMerov Linden
2014-10-18Update to build on Xcode 6.0: private field isMuted is not usedcallum_linden
2014-08-12Pull merge from lindenlab/viewer-releaseMerov Linden
2014-07-14MAINT-4226 Group ban option is added to participant menu in Group chat.Mnikolenko ProductEngine
2014-06-03DD-84 : Fix all active listing modification actions. Add specific message ↵Merov Linden
when listing will unlist. Make update skip consistency check when called from internal level (not public API).
2013-12-09MAINT-3017 FIX Inventory filter for Recent tab does not persist between ↵Richard Linden
sessions as it used to. added names back to inventory filters, so they can be deserialized
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-04-19CHUI-849 : Use a time limit for filtering instead of number limit, use a ↵Merov Linden
different limit for visible and unvisible lists
2013-04-18CHUI-849 : WIP : Filter limit on time instead of number of itemsMerov Linden
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-02-27CHUI-788 FIXED Mute icon not shown in participant list in conversation floatermaksymsproductengine
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-13Fixed path for correct assembly of the projectAlexanderP ProductEngine
2012-12-10CHUI-394 (Group moderation tools missing in right click menus)MaximB ProductEngine
2012-11-14CHUI-479 : WIP : More tracingMerov Linden
2012-11-14CHUI-479 : WIP : Add debug tracing into speaking indicator manager and ↵Merov Linden
monitors (to be deleted eventually).
2012-10-30CHUI-459: Creating a fetchAvatarName() method for the ↵William Todd Stinson
LLConversationItemParticipant class to allow the class to query for the avatar display name directly. Also, added a field to store the avatar name cache callback connection so that we can disconnect properly on object destruction to avoid a crash with the callback attempting to access recently freed memory.
2012-10-05CHUI-194 : WIP : Update the ad-hoc conversation line item title, add a new ↵Merov Linden
update_session event. Still some clean up to do.
2012-10-04CHUI-381 : Implement add_participant and update_participant events handling.Merov Linden