7bcb96b2f9
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/ISSUE_TEMPLATE/10-bug.yaml
# .github/ISSUE_TEMPLATE/20-enhancement.md
# .github/ISSUE_TEMPLATE/config.yml
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llviewermenu.cpp
# indra/newview/llvoavatar.h
# indra/newview/skins/default/xui/en/panel_performance_nearby.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-03-05 11:55:43 +01:00
5dcc0606a8
Issue#880 Crash on a dead pointer in a chat session
2024-02-23 19:18:13 +02:00
0af17f6584
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-09-13 20:23:04 +02:00
372e5b6dfa
SL-3007 Report abuse option in paticipan list
2022-09-08 02:19:13 +03:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
8a44c58dee
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-04-02 22:53:28 +02:00
2e3174ab3f
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 16:53:46 +02:00
18323f019f
SL-15061 Crash deleting non-zero reference in LLConversationItemSession
2021-04-01 20:56:19 +03:00
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
b61a998574
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 19:29:33 +01:00
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
db161b6f85
SL-14074 Resolved potential cause of conversation crashes
...
Models (listeners) belong to folder-views, deleting all of them means that not only proper cleanup procedure won't be followed, and view might try clean dead pointer.
2021-01-05 18:20:47 +02:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
1062164cfe
SL-13119 Duplicate check was causing slowdowns
2020-04-28 18:13:14 +03:00
6a624eb242
Merge viewer-neko
2019-02-19 17:30:44 +01:00
a8afd345a0
SL-10351 Cleanup
2019-02-15 15:03:27 +02:00
c764079389
Merge viewer-neko
2019-02-14 21:21:38 +01:00
3a8053eb9f
SL-10351 Fixed Avatars muted by Group moderator become Blocked forever
2019-02-11 19:01:28 +02:00
b31cd0a7e9
SL-10347 Fixed Users can't exchange text messages after moderator click on "Mute everyone"
2019-02-11 17:40:41 +02:00
bff6a3af15
Merge viewer-neko
2017-02-23 09:02:58 +01:00
605160d501
MAINT-7118 Swapping legacy people API with new cache
2017-02-15 20:40:03 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
d7702f47e8
MAINT-5345 FIXED Unable to end IM voice call using context menu.
2015-07-02 12:51:45 +03:00
8da9ca220e
Merge LL 3.7.13 Group Banz
2015-01-12 09:48:53 -08:00
b4df05d21a
MAINT-4226 Group ban option is added to participant menu in Group chat.
2014-07-14 12:31:16 +03:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
2268bf3833
merge changes for 3.5.3-release
2013-06-13 15:28:13 -04:00
ec52db8d0c
STORM-1838 Slowly reappling changes to work with CHUI
2013-06-05 17:32:10 -04:00
58d2896a07
CHUI-918 Don't show "Close Selected" item if Nearby chat is selected
2013-06-05 19:27:48 +03:00
430af6f731
CHUI-918 FIXED Close only selected conversations instead of closing all conversations.
2013-06-04 14:49:07 +03:00
ef69d31b99
CHUI-918 FIXED "Close all conversations" menu item is added to context menu.
2013-05-29 15:53:36 +03:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
25c222e317
CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby chat.
2013-04-23 15:09:41 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8b38892243
CHUI-700 FIX [CHUIBUG]"Zoom in" feature for avatars has disappeared
...
Added "Zoom In" context menu item to Nearby Chat list in People floater and Conversation floater
2013-03-14 01:28:40 +01:00
31e5465158
CHUI-788 FIXED Mute icon not shown in participant list in conversation floater
2013-02-27 01:35:27 +02:00
5a92a77006
CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute this participant"
...
Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp
2013-02-12 01:12:47 +00:00
d2a17e20ca
CHUI-612 FIXED Blank conversation names showing in conversation list
2013-01-31 03:16:25 +02:00
4a96941b73
CHUI-395 (Group moderators are not shown as Moderators in group conversation)
2013-01-28 18:06:27 +02:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e829db8b2c
FS communication UI: Ifdef out llconversationmodel for now as we don't use it yet
2013-06-29 19:42:10 +02:00
Ansariel