summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
AgeCommit message (Collapse)Author
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2021-10-25SL-16234 handle closing floater correctlyMnikolenko Productengine
2021-10-22SL-16234 FIXED Frame stall caused by unnecessary building the floater when ↵Mnikolenko Productengine
exiting viewer
2021-09-06SL-15950 Crash at selectConversationPairAndrey Kleshchev
According to callstack data, new_selection was somehow 0x0002 which is invalid. According to logs, session was just deleted, right before opening floater to some other session by arriving message, likely to the removed one.
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
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-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
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-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-10-07SL-14074 LLConversationItemParticipant crashAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-07-16SL-13609 Better indicate which conversation is active in Conversations floaterMnikolenko Productengine
2020-07-09SL-13397 Reduce Viewer freeze when opening chat with a large group.Mnikolenko Productengine
2020-05-18Small CleanupAndrey Kleshchev
2020-03-11SL-12452 FIXED The moderator can't unmute himself in the group call after ↵maxim_productengine
turning on 'Mute everyone' option
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2019-02-20SL-1811 Slight chat optimizationandreykproductengine
2018-02-28MAINT-8181 Save conversation panel width between sessionsmaxim_productengine
2017-05-17MAINT-6805 Fixed Right-click menus in the right and left panes of the ↵andreykproductengine
Conversations windows are different
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2016-12-27MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem()Mnikolenko Productengine
2016-08-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-19MAINT-5297 Backed out changeset: bfef055de5f5AndreyL ProductEngine
2015-11-19MAINT-5297 Backed out changeset: dd9e3cbf10e5AndreyL ProductEngine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-11-02Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-10-27MAINT-5758 FIXED "Ban Member" from the group chatters list context menuAndreyL ProductEngine
is greyed out once you have performed a ban, until you load the group members list from group info.
2015-09-02MAINT-5297 Allow global toggle of 'View People Icons' - Global switch partAndreyL ProductEngine
--HG-- branch : develop
2015-09-01MAINT-5297 Allow global toggle of 'View People Icons' - Chat window partAndreyL ProductEngine
--HG-- branch : develop
2015-08-13MAINT-5219 FIXED "Ban Member" from the group chatters list context menu is ↵AndreyL ProductEngine
greyed out when you have the ability to manage the ban list
2015-05-26MAINT-5233 FIXED Viewer fall into recourse and crash when try open chat floaterMnikolenko ProductEngine
2015-05-22MAINT-5232: Clean up some dubious LLSingleton methods.Nat Goodspeed
Remove evil getIfExists() method, used by no one. Remove evil destroyed() method, used in exactly three places -- one of which is a test. Replace with equally evil instanceExists() method, which is used EVERYWHERE -- sigh.
2015-05-19MAINT-5201 FIXED 'Chat history' option in context menu does not works for ↵Mnikolenko ProductEngine
multiperson chat.
2015-05-15MAINT-5206 FIXED always show Nearby chat on first opening of IMcontainer ↵Mnikolenko ProductEngine
floater.
2014-08-05DRTVWR-373 Merge with viewer-release 3.7.13maksymsproductengine
2014-07-16MAINT-4263 FIXED Viewer crashes after right click on group in Conversations.maksymsproductengine
2014-07-14MAINT-4226 Group ban option is added to participant menu in Group chat.Mnikolenko ProductEngine
2014-06-18MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselectionmaxim@mnikolenko
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-12MAINT-3963 FIXED The behavior of speak button in the conversations HUB and ↵Mnikolenko ProductEngine
toolbar button is consistent now. Use setUserPTTState(false) to switch off the mic.
2014-05-07Merge downstream version 3.7.8 codesimon
2014-03-24MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselectionMnikolenko ProductEngine
2014-03-12merge with releaseRichard Linden
2014-03-11Merge downstream code to 3.7.4simon
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 09:11:47 +0000