summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
AgeCommit message (Collapse)Author
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-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-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)
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
2014-02-25Merge downstream codesimon
2014-02-21Merge downstream codesimon
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-05MAINT-3484 FIXED Disable menu item if transcript doesn't exist.Mnikolenko ProductEngine
2013-11-12BUILDFIX - miscellaneous stuff missed in the mergeRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:01:11 +0000