Commit Graph

250 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Andrey Kleshchev 372e5b6dfa SL-3007 Report abuse option in paticipan list 2022-09-08 02:19:13 +03:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# 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
2022-03-01 13:41:42 +02:00
Mnikolenko Productengine a5b1c01354 SL-16234 handle closing floater correctly 2021-10-25 21:23:26 +03:00
Mnikolenko Productengine f2eba1909d SL-16234 FIXED Frame stall caused by unnecessary building the floater when exiting viewer 2021-10-22 16:09:41 +03:00
Andrey Kleshchev a0a235784f SL-15950 Crash at selectConversationPair
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-09-06 22:37:24 +03:00
Dave Houlton 2386125ae0 Merge master into DV525-merge-6.4.19 2021-04-29 11:40:22 -06:00
Andrey Kleshchev 3c002e7db5 SL-14975 SL-14384 viewer crashes because of large chat groups
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-03-26 15:47:49 -06:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master 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-02-01 22:28:15 +02:00
Andrey Kleshchev f86014ef15 SL-14270 Crash on participant's updateName
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-06 01:33:26 +02:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint
# 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-11-11 22:14:24 +02:00
Andrey Kleshchev 1ff3f15203 SL-14074 LLConversationItemParticipant crash 2020-10-07 19:56:13 +03:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
Andrey Lihatskiy a2cb61d9f4 Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
Dave Houlton 86e7cc3d35 Merge branch 'master' v6.4.9 into DRTVWR-497 2020-09-22 15:28:13 -06:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
Mnikolenko Productengine 2c93c14c9d SL-13609 Better indicate which conversation is active in Conversations floater 2020-07-16 17:51:06 +03:00
Mnikolenko Productengine e1e25f9a0d SL-13397 Reduce Viewer freeze when opening chat with a large group. 2020-07-09 12:15:03 -06:00
Andrey Kleshchev 9751942372 Small Cleanup 2020-05-18 18:33:08 +03:00
maxim_productengine 6a9658a650 SL-12452 FIXED The moderator can't unmute himself in the group call after turning on 'Mute everyone' option 2020-03-11 17:34:42 +02:00
andreykproductengine 779b5627c5 DRTVWR-493 LLAvatarNameCache to singletone 2019-07-03 20:06:47 +03:00
andreykproductengine 86d28366b1 SL-1811 Slight chat optimization 2019-02-20 20:30:43 +02:00
maxim_productengine 9ff12db91c MAINT-8181 Save conversation panel width between sessions 2018-02-28 12:44:51 +02:00
andreykproductengine e72c120e9e MAINT-6805 Fixed Right-click menus in the right and left panes of the Conversations windows are different 2017-05-17 22:34:50 +03:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Mnikolenko Productengine 92d84a9c36 MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem() 2016-12-27 12:04:51 +02:00
Nat Goodspeed c92eb7e591 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-08-30 11:36:06 -04:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
AndreyL ProductEngine d6284458e5 MAINT-5297 Backed out changeset: bfef055de5f5 2015-11-19 22:17:54 +02:00
AndreyL ProductEngine 0c4ec86424 MAINT-5297 Backed out changeset: dd9e3cbf10e5 2015-11-19 22:17:37 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nat Goodspeed 11c428759e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-11-02 14:09:43 -05:00
AndreyL ProductEngine eccafc5c40 MAINT-5758 FIXED "Ban Member" from the group chatters list context menu
is greyed out once you have performed a ban, until you load the group
members list from group info.
2015-10-27 14:04:25 +02:00
AndreyL ProductEngine 70136a7e3d MAINT-5297 Allow global toggle of 'View People Icons' - Global switch part
--HG--
branch : develop
2015-09-02 01:16:18 +03:00
AndreyL ProductEngine 540493b315 MAINT-5297 Allow global toggle of 'View People Icons' - Chat window part
--HG--
branch : develop
2015-09-01 23:16:58 +03:00
AndreyL ProductEngine 9e64435bd2 MAINT-5219 FIXED "Ban Member" from the group chatters list context menu is greyed out
when you have the ability to manage the ban list
2015-08-13 07:53:38 +03:00
Mnikolenko ProductEngine 394952e476 MAINT-5233 FIXED Viewer fall into recourse and crash when try open chat floater 2015-05-26 17:27:53 +03:00
Nat Goodspeed 331e932857 MAINT-5232: Clean up some dubious LLSingleton methods.
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-22 14:02:24 -04:00
Mnikolenko ProductEngine 193a298266 MAINT-5201 FIXED 'Chat history' option in context menu does not works for multiperson chat. 2015-05-19 12:01:32 +03:00
Mnikolenko ProductEngine 102908a2f2 MAINT-5206 FIXED always show Nearby chat on first opening of IMcontainer floater. 2015-05-15 11:43:13 +03:00
maksymsproductengine 9074ea1663 DRTVWR-373 Merge with viewer-release 3.7.13 2014-08-05 22:11:05 +03:00
maksymsproductengine 0f22bcdff0 MAINT-4263 FIXED Viewer crashes after right click on group in Conversations. 2014-07-16 02:16:48 +03:00
Mnikolenko ProductEngine b4df05d21a MAINT-4226 Group ban option is added to participant menu in Group chat. 2014-07-14 12:31:16 +03:00
maxim@mnikolenko f924175da0 MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection 2014-06-18 13:00:18 +03:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Mnikolenko ProductEngine ccb91c6da4 MAINT-3963 FIXED The behavior of speak button in the conversations HUB and toolbar button is consistent now. Use setUserPTTState(false) to switch off the mic. 2014-05-12 11:52:39 +03:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
Mnikolenko ProductEngine 7698e169f5 MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection 2014-03-24 11:20:59 +02:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon c7aad1f7e3 Merge downstream code to 3.7.4 2014-03-11 10:41:52 -07:00