summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
AgeCommit message (Collapse)Author
32 hoursMerge remote-tracking branch 'secondlife/release/26.4' into 26.4Erik Kundiman
2026-08-12Merge branch 'release/26.3' into geenz/linux-to-developJonathan "Geenz" Goodman
2026-08-07Merge tag 'Second_Life_Release#0686467f-26.3' into 26.3Erik Kundiman
2026-07-31#6070 Highlight ad-hoc conversation on creatingAndrey Lihatskiy
2026-07-30Merge tag 'Second_Life_Release#f93c8694-26.3' into 26.3Erik Kundiman
2026-07-23#5804 Select opened adhoc chatAndrey Lihatskiy
2026-06-13Merge tag 'Second_Life_Release#663bf4d3-26.3' into 26.3Erik Kundiman
2026-05-20Merge branch 'develop' into geenz/26.3-to-developJonathan "Geenz" Goodman
2026-05-20Merge branch 'main' into geenz/26.2-to-26.3Jonathan "Geenz" Goodman
2026-05-20#5804 Prevent focus steal when removing unselected conversation widgetAndrey Lihatskiy
2026-05-18#5804 Prevent focus steal when removing unselected conversation widgetAndrey Lihatskiy
2026-05-14#5804 Prevent group chat focus steal when opening adhoc IMAndrey Lihatskiy
2026-03-07Merge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.02Erik Kundiman
2025-12-10#5129 Hide moderator options for participants who are not connected to the ↵Maxim Nikolenko
same voice space
2025-11-14Toggle off 'Speak' button when muted by moderatorMnikolenko Productengine
2025-10-30#4013 Update voice moderator options; show notifications when muted; add ↵Mnikolenko Productengine
stub code for info request
2025-10-26Merge tag 'Second_Life_Release#4e2a9667-2025.08' into 2025.08Erik Kundiman
2025-10-22Merge branch 'develop' of https://github.com/secondlife/viewer into ↵Callum Prentice
callum/voice-moderation-2
2025-10-21#2427 Show torn off chat when clicking on a message popupAndrey Kleshchev
2025-10-13Improve robustness of when moderator options appear and add some initial ↵Callum Prentice
code for muting indivudual / everyone via the capability
2025-10-08First commit for a second experiment, investigating how nearby voice/chat ↵Callum Prentice
moderation might work
2025-08-15Merge tag 'Second_Life_Release#922d2324-2025.06' into 2025.06Erik Kundiman
2025-08-12#4473 Enable Zoom in to Self menu option in chatAndrey Kleshchev
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-06-27#4184 clearAndDeparentModels crashAndrey Kleshchev
To resolve dual ownership switched children to LLPointer
2025-05-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-07#4011 Add conversation list highlight for chat mentionMaxim Nikolenko
2025-03-29Merge tag 'Second_Life_Release#4e80ec7e-2025.03' into 2025.03Erik Kundiman
2025-03-26#3803 Crash at LLTabContainer::setTabMaxim Nikolenko
2024-11-08Merge branch 'main' into 2024.09-ExtraFPSErik Kundiman
2024-11-08Nearby session being first is a non default optionErik Kundiman
which can be set on the leftmost drop-down menu of the conversations floater.
2024-09-07viewer#2411 Use font buffer for inventoryAndrey Kleshchev
2024-08-20Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into developBrad Linden
# Conflicts: # autobuild.xml # indra/newview/llvoicewebrtc.cpp
2024-08-20SL-15061 Crash at LLConversationItemSession::clearAndDeparentModels #3Andrey Kleshchev
2024-08-19viewer#2296 Don't show 'are you sure you want to leave the call' when ↵Andrey Kleshchev
shutting down
2024-08-09Fix nullptr crash in LLFloaterIMContainer::onAddButtonClickedRye Mutt
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
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-10Merge branch 'main' into marchcat/y-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-21Viewer#822 Sort participants by recent activity is not workingAndrey Kleshchev
2024-01-09DRTVWR-599 OSX buildfix #2Andrey Lihatskiy
remove unused typedef
2024-01-09Replace BOOST_FOREACH with standard C++ range-based for-loopsAnsariel
2023-12-04SL-20679 fix for "Sort conversations by recent activity" optionMaxim Nikolenko
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-10-05SL-20348 Focus should be in the chat bar when the Conversations floater is ↵Alexander Gavriliuk
opened