Commit Graph

228 Commits (82b05f1063a410ef2f8e1de5bac9f9eedcf1450c)

Author SHA1 Message Date
Ansariel 82b05f1063 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloater.h
#	indra/newview/llfloatersnapshot.h
#	indra/newview/llstatusbar.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/en/floater_snapshot.xml
#	indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/ja/panel_settings_water.xml
#	indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/pt/strings.xml
#	indra/newview/skins/default/xui/ru/strings.xml
#	indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/zh/strings.xml
#	scripts/messages/message_template.msg
#	scripts/messages/message_template.msg.sha1
2025-03-31 23:55:28 +02:00
Andrey Kleshchev 5608c3998d viewer#2270 The "More" button does not close the "Choose emoji" floater 2025-03-19 21:55:01 +02:00
Ansariel 83d74614cf Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2025-01-22 00:42:22 +01:00
Andrey Kleshchev 75a01bf428 #3319 Crash at LLInitParam::Param::setProvided
Most crashes are related to LLStyle, log analysis suggests that it might
be a number of different issues, including memory and disk issues.
Just avoid recreating expensive LLStyle without reason.
2025-01-20 12:40:05 +02:00
Ansariel 8ed4989c34 Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llvoicevivox.cpp
2024-11-07 18:02:38 +01:00
Andrey Kleshchev 0114be2c15 viewer#2985 Odd crash when notifying voice observers
Crash points at enableDisableCallBtn, but button's floater was cleaned
earlier and has a removeObserver call so an observer record should be
long gone. Likely something else is going on.
Went over various callbacks and made sure they are cleaned. But in case
floater somehow remained, added mSession = nullptr.
2024-11-01 17:54:05 +02:00
Ansariel ef39bd37fa Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llglsandbox.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2024-09-11 03:02:44 +02:00
Roxie Linden 9d8376071a Callback button for groups was not being reenabled after hanging up on group call.
For #2532, callback button was remaining disabled after hanging up on a group call.

Also, fix an issue where user was automatically added to a group call after the
initiator of the group call hangs up and re-calls the group.
2024-09-09 11:58:18 -07:00
Ansariel 4a438dcfd4 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llcallstack.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
2024-08-23 13:47:48 +02:00
Alexander Gavriliuk f7bb097247 #2325 WebRTC: p2p voice calling option sometimes becomes disabled after calling another agent back too soon 2024-08-22 17:18:42 +02:00
Ansariel 830eeaa6ff Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llface.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
Brad Linden 68f712615f Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
 #	autobuild.xml
 #	indra/newview/llvoicewebrtc.cpp
2024-08-20 09:44:14 -07:00
Brad Linden 5f26ba8014 Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
 #	indra/newview/llpanelpeople.cpp
2024-08-15 09:41:54 -07:00
Andrey Kleshchev e086437f12 viewer-private#262 webrtc crashes on shutdown
removeObserver failed to remove an im session floater
2024-08-13 19:30:17 +03:00
Alexander Gavriliuk c8f0cdd1a9 #2257 BugSplat Crash #1503682: SecondLifeViewer!LLFloaterIMSessionTab::enableDisableCallBtn(438) 2024-08-12 19:51:49 +02:00
Ansariel 450d02ad39 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/ISSUE_TEMPLATE/10-bug.yaml
#	indra/llui/lldockcontrol.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llviewereventrecorder.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanelland.cpp
#	indra/newview/llphysicsmotion.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/llviewermenu.cpp
2024-07-25 20:47:57 +02:00
Rye Mutt b5491416a0 Fix getChild calls during draw from LLFloaterIMSessionTab 2024-07-25 08:45:52 -04:00
Ansariel e65ec7d145 Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/llfloaterimsessiontab.cpp
2024-07-18 21:56:49 +02:00
Ansariel cf5bc75d44 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
# Conflicts:
#	indra/newview/llpanelsnapshot.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/llspeakers.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/rlvinventory.cpp
2024-07-18 21:53:13 +02:00
Ansariel f04ed0e5e4 Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/llspeakers.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/skins/default/xui/de/menu_viewer.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/menu_viewer.xml
#	indra/newview/skins/default/xui/pl/menu_viewer.xml
#	indra/newview/skins/default/xui/pt/menu_viewer.xml
#	indra/newview/skins/default/xui/ru/menu_viewer.xml
#	indra/newview/skins/default/xui/tr/menu_viewer.xml
#	indra/newview/skins/default/xui/zh/menu_viewer.xml
2024-07-18 20:27:40 +02:00
Roxie Linden 33418a77b7 Convert tabs to spaces 2024-06-26 14:43:22 -07:00
Andrey Kleshchev 39f0da7ab6 Issue#880 Crash on a dead pointer in a chat session 2024-06-25 18:39:09 -07:00
Ansariel 1bbe697db7 Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llappearance/llavatarappearance.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvocache.cpp
2024-06-11 14:38:20 +02:00
Ansariel 2696b3de08 Introduce LLWStringView to prevent unnecessary memory allocations 2024-05-24 13:55:38 +03: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
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	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/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	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/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
Ansariel f0e4dcdaf6 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llthread.h
#	indra/llmessage/llcachename.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llnotificationhandlerutil.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
2024-05-08 05:10:22 +02:00
Alexander Gavriliuk f9473e8afc secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries 2024-05-07 10:18:51 +02:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03: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
Ansariel b1a271c3aa Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/ICU4C.cmake
#	indra/llui/lltextbase.h
#	indra/llui/llview.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2024-03-17 17:53:34 +01:00
Ansariel 7adeeae86b Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lllineeditor.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.h
#	indra/newview/llchicletbar.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolfocus.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
2024-03-13 02:47:00 +01:00
Ansariel 0aa1e8ff51 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/fsfloaternearbychat.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
#	indra/newview/qtoolalign.h
#	indra/newview/utilitybar.h
2024-03-13 02:31:59 +01:00
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
2024-03-12 16:52:30 +01:00
Alexander Gavriliuk 66d1b0f0ef triage#103 The focused state of the 'Recently used emojis' is not visible 2024-03-07 01:08:57 +01:00
Ansariel 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
Andrey Kleshchev d31de6afb2 Issue#884 Crash on ~LLSearchEditor
Crash seems to be specific to LLFilterEditor and only in a couple
specific floaters. Based on older calltacks, commiting on exit was
crashing. So I'm making sure that panels that potentially do not own
the element in question clean the callback in case panels get deleted
before the search editor.
2024-02-25 15:28:02 +02:00
Andrey Kleshchev 5dcc0606a8 Issue#880 Crash on a dead pointer in a chat session 2024-02-23 19:18:13 +02:00
Ansariel b71c7f37ea Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llagent.cpp
#	indra/newview/llagent.h
#	indra/newview/llagentcamera.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llattachmentsmgr.cpp
#	indra/newview/llattachmentsmgr.h
#	indra/newview/llavataractions.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llcompilequeue.cpp
#	indra/newview/llcontrolavatar.h
#	indra/newview/lldirpicker.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolalpha.h
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloateravatarpicker.cpp
#	indra/newview/llfloaterbeacons.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llfloaterdisplayname.cpp
#	indra/newview/llfloatergotoline.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llfloaterscriptdebug.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llfloatertools.cpp
#	indra/newview/llfloatertools.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llhudeffectlookat.cpp
#	indra/newview/llhudeffectlookat.h
#	indra/newview/llhudicon.cpp
#	indra/newview/llhudmanager.cpp
#	indra/newview/llhudtext.cpp
#	indra/newview/llhudtext.h
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllogininstance.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llmodelpreview.h
#	indra/newview/llmutelist.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/llnetmap.h
#	indra/newview/llnotificationlistitem.cpp
#	indra/newview/lloutputmonitorctrl.cpp
#	indra/newview/llpanelcontents.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelexperiencepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroupnotices.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanellandaudio.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelobject.cpp
#	indra/newview/llpanelobject.h
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaces.cpp
#	indra/newview/llpanelpresetspulldown.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelsnapshot.h
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llpreviewnotecard.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llpreviewtexture.cpp
#	indra/newview/llpreviewtexture.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturecache.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltoastimpanel.cpp
#	indra/newview/lltoolbarview.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.cpp
#	indra/newview/lltoolgrab.cpp
#	indra/newview/lltoolgun.cpp
#	indra/newview/lltoolgun.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/lltoolplacer.cpp
#	indra/newview/lltoolselect.cpp
#	indra/newview/lluploaddialog.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerfoldertype.cpp
#	indra/newview/llviewerinput.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerobjectlist.h
#	indra/newview/llviewerparcelmgr.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexlayer.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvosky.cpp
#	indra/newview/llvosurfacepatch.cpp
#	indra/newview/llvotree.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/llvowater.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/llworldmipmap.cpp
#	indra/newview/pipeline.cpp
2024-02-22 11:43:04 +01:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel 314639426d Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llchat.h
#	indra/llui/llcombobox.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderview.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmultifloater.cpp
#	indra/llui/llmultifloater.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/llui/llspinctrl.cpp
#	indra/llui/llspinctrl.h
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltabcontainer.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/llui/llviewereventrecorder.cpp
#	indra/llxml/llcontrol.cpp
#	indra/llxml/llcontrol.h
#	indra/newview/llagentlanguage.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llavatarlistitem.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llchicletbar.cpp
#	indra/newview/llfloaterbuildoptions.cpp
#	indra/newview/llfloaterbuildoptions.h
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llfloaterconversationpreview.h
#	indra/newview/llfloaterdestinations.h
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterjoystick.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llfloaterpay.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterscriptdebug.cpp
#	indra/newview/llfloaterscriptdebug.h
#	indra/newview/llfloaterscriptedprefs.cpp
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatertools.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llmediactrl.h
#	indra/newview/llmoveview.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/llnotificationlistitem.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroupnotices.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelobject.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llpanelpermissions.h
#	indra/newview/llpanelprofileclassifieds.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelsnapshot.h
#	indra/newview/llpanelsnapshotinventory.cpp
#	indra/newview/llpanelsnapshotlocal.cpp
#	indra/newview/llpanelsnapshotpostcard.cpp
#	indra/newview/llpreviewnotecard.h
#	indra/newview/llstartup.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/llstatusbar.h
#	indra/newview/llsyswellwindow.h
#	indra/newview/lltexturectrl.h
#	indra/newview/lltoolbarview.cpp
#	indra/newview/lltoolselect.cpp
#	indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Ansariel dd3b29d82c Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2024-02-14 18:05:08 +01:00
Alexander Gavriliuk b4e29ec0e9 #68 The 'Recently used emoji' can not be selected by the 'Tab' key 2024-02-09 16:16:01 +03:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
2024-01-26 00:32:06 +01:00
Alexander Gavriliuk c5f4eb32a9 SL-20416 Use image from file for emoji_recent_panel_toggle_btn 2024-01-24 17:50:43 +01:00
Alexander Gavriliuk f6ceafee5b SL-20416 Avoid of taking focus by EmojiPicker 2024-01-24 00:07:10 +03:00
Ansariel f072b3f952 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-11-30 19:16:29 +01:00