Commit Graph

125 Commits (6487febff084108f6dfc4d8587ebd3efda4dcb95)

Author SHA1 Message Date
Ansariel 80f9aaa46e Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Audio.cmake
#	indra/llui/llconsole.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterscriptedprefs.cpp
#	indra/newview/llhudnametag.cpp
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llscripteditor.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewerchat.cpp
#	indra/newview/llviewerchat.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewerparceloverlay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvosurfacepatch.cpp
2024-08-05 20:10:02 +02:00
Rye Mutt 456d013ba8 Fix various issues with ui elements not updating colors dynamically 2024-08-04 23:11:57 -04:00
Ansariel 3d9414c1f2 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloaterreg.cpp
#	indra/llui/llnotifications.cpp
#	indra/llui/llpanel.cpp
#	indra/llui/llui.cpp
#	indra/llui/lluicolortable.cpp
#	indra/llui/lluicolortable.h
#	indra/newview/llappviewer.h
#	indra/newview/llfloatersidepanelcontainer.cpp
#	indra/newview/llfloatersidepanelcontainer.h
#	indra/newview/llpanelpeoplemenus.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2024-07-03 01:11:47 +02:00
Rye Mutt b0e30477e9 Use heterogeneous comparison for string_view map finds in LLControl and convert controlExists to string_view 2024-07-01 22:25:56 -04:00
Rye Mutt e834e77988 Reduce string temporaries from findChild and getChild 2024-07-01 21:50:54 -04: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 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 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
Ansariel 80c3fe0101 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-03-05 21:27:49 +01:00
Alexander Gavriliuk 27dd9ee482 triage#86 Use Emoji font in LineEditor by default 2024-03-05 15:37:49 +01: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 210f59a923 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderview.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llstatbar.cpp
#	indra/llui/lltabcontainer.h
#	indra/llwindow/lldxhardware.cpp
#	indra/llwindow/lldxhardware.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/llavatarlist.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llchiclet.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltoolcomp.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolpie.cpp
2024-02-18 16:22:54 +01:00
Ansariel c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02: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 f6ceafee5b SL-20416 Avoid of taking focus by EmojiPicker 2024-01-24 00:07:10 +03:00
Ansariel 2180c2a443 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-20 18:15:38 +01:00
Mnikolenko Productengine 783a802abc SL-19359 Show Received Items panel in all new Inventory floaters 2023-03-08 02:41:11 +02:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 618057fa04 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-05-01 00:29:48 +02:00
Brad Payne (Vir Linden) acb2e87d94 SL-14862 - renamed widgets to the more descriptive controls 2021-03-11 15:11:51 +00:00
Brad Payne (Vir Linden) dd89dec893 SL-14862 - more types of UI usage logs 2021-03-01 21:38:46 +00:00
Brad Payne (Vir Linden) 48597039b2 SL-14862 - LLViewerStats logs which UI features get used 2021-02-11 15:29:20 +00:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Kleshchev 80447f5e6b SL-11172 Re-fixed, now should affect 'tab' only 2020-04-13 15:06:11 +03:00
Ansariel c2d9c3f634 Merge viewer-neko 2020-01-29 19:07:49 +01:00
andreykproductengine 941c1ee7f8 SL-11172 Scroll to focused object if object is not in visible area 2020-01-09 20:54:36 +02:00
andreykproductengine 204d9c35e0 SL-1171 [Dev tools] UI controls <-> settings connection issues 2019-08-30 19:06:30 +03:00
Ansariel 5c86d6298a Merge viewer-neko 2019-08-31 14:32:43 +02:00
Ansariel b6ca98e197 Save some type conversions here... 2017-11-27 17:10:37 +01:00
Ansariel 6e8e6ce0b4 enabled_control / disabled_control don't work properly with LLRadioGroup (additional fix) 2016-06-22 21:41:44 +02:00
Ansariel a61c49f173 enabled_control / disabled_control don't work properly with LLRadioGroup 2016-06-21 21:39:29 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden c4fc085f74 fixed some warnings 2013-11-06 18:16:57 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden a10eb7b240 further fix of inventory keyboard focus and tab order calculations 2013-11-05 19:30:38 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
Richard Linden 053d97db1b better memory usage for LLTrace (tighter packing of recording arrays)
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00