Commit Graph

102 Commits (69d7c0f7efa648b0016baa98ccbe584cb91203ff)

Author SHA1 Message Date
Andrey Kleshchev 4bc20a8e53 #4184 clearAndDeparentModels crash
To resolve dual ownership switched children to LLPointer
2025-06-27 14:48:18 +03:00
Maxim Nikolenko 265ebfb82f
#3346 crash at LLConversationItemSession::clearAndDeparentModels 2025-02-04 19:19:50 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# 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-05-22 19:04:52 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# 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-24 19:28:15 +03:00
Ansariel d0102af56d Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	indra/llcommon/llapp.cpp
#	indra/llcommon/llapp.h
#	indra/llimage/llimageworker.cpp
#	indra/llui/llcontainerview.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llkeywords.cpp
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfavoritesbar.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llhudnametag.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelvoicedevicesettings.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltranslate.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
Andrey Lihatskiy 84dfe55810 Merge branch 'main' into marchcat/y-merge
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
2024-04-10 07:08:25 +03:00
Andrey Kleshchev 5dcc0606a8 Issue#880 Crash on a dead pointer in a chat session 2024-02-23 19:18:13 +02:00
Ansariel ba74152c82 Replace BOOST_FOREACH with standard C++ range-based for-loops 2024-01-09 20:44:50 +02:00
Andrey Kleshchev 226a0025e9 SL-20182 dirtyFilter crash while accessing parent 2023-08-22 00:46:34 +03:00
Andrey Kleshchev 372e5b6dfa SL-3007 Report abuse option in paticipan list 2022-09-08 02:19:13 +03:00
Dave Houlton 2386125ae0 Merge master into DV525-merge-6.4.19 2021-04-29 11:40:22 -06:00
Andrey Kleshchev 18323f019f SL-15061 Crash deleting non-zero reference in LLConversationItemSession 2021-04-01 20:56:19 +03: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 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 Kleshchev 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
Andrey Kleshchev 1062164cfe SL-13119 Duplicate check was causing slowdowns 2020-04-28 18:13:14 +03:00
andreykproductengine a8afd345a0 SL-10351 Cleanup 2019-02-15 15:03:27 +02:00
andreykproductengine 3a8053eb9f SL-10351 Fixed Avatars muted by Group moderator become Blocked forever 2019-02-11 19:01:28 +02:00
andreykproductengine b31cd0a7e9 SL-10347 Fixed Users can't exchange text messages after moderator click on "Mute everyone" 2019-02-11 17:40:41 +02:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine d7702f47e8 MAINT-5345 FIXED Unable to end IM voice call using context menu. 2015-07-02 12:51:45 +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
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Oz Linden 2268bf3833 merge changes for 3.5.3-release 2013-06-13 15:28:13 -04:00
Jonathan Yap ec52db8d0c STORM-1838 Slowly reappling changes to work with CHUI 2013-06-05 17:32:10 -04:00
Mnikolenko ProductEngine 58d2896a07 CHUI-918 Don't show "Close Selected" item if Nearby chat is selected 2013-06-05 19:27:48 +03:00
Mnikolenko ProductEngine 430af6f731 CHUI-918 FIXED Close only selected conversations instead of closing all conversations. 2013-06-04 14:49:07 +03:00
Mnikolenko ProductEngine ef69d31b99 CHUI-918 FIXED "Close all conversations" menu item is added to context menu. 2013-05-29 15:53:36 +03:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
Mnikolenko ProductEngine 25c222e317 CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby chat. 2013-04-23 15:09:41 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Cho 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
maksymsproductengine 31e5465158 CHUI-788 FIXED Mute icon not shown in participant list in conversation floater 2013-02-27 01:35:27 +02:00
Cho 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
maksymsproductengine d2a17e20ca CHUI-612 FIXED Blank conversation names showing in conversation list 2013-01-31 03:16:25 +02:00
mberezhnoy 4a96941b73 CHUI-395 (Group moderators are not shown as Moderators in group conversation) 2013-01-28 18:06:27 +02:00
maksymsproductengine def252341a CHUI-612 FIXED Blank conversation names showing in conversation list 2013-01-08 23:37:29 +02:00
Merov Linden fbc414c02b Merge with viewer-chui 2013-01-04 20:28:01 -08:00
Merov Linden 12554bffb3 CHUI-580 : Fixed : Avoid fetching names while reacting to display name checkbox change (overkill), make display name pref disabled when usePeopleAPI is off 2013-01-04 20:23:14 -08:00
Merov Linden 090636f107 CHUI-429 : Fixed! Add a flag to filter multi/single selection situations in menu building. Implement in conversation contextual menu. 2012-12-20 18:36:01 -08:00
Merov Linden c2d332a89c CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue 2012-12-17 20:16:33 -08:00
Merov Linden 6fe7144104 CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary 2012-12-17 18:59:01 -08:00
MaximB ProductEngine f49d47b304 CHUI-394 (Group moderation tools missing in right click menus) 2012-12-10 17:22:56 +02:00
Merov Linden a6f1690128 CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the display of (waiting) when names don't come (mostly in legacy mode). 2012-12-07 18:58:52 -08:00