15 Commits (master)

Author	SHA1	Message	Date
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	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	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	603e04ee3c	Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer	2021-08-24 13:18:55 +02:00
Andrey Kleshchev	da5cc13df2	SL-15410 Menu search breaks torn off menus	2021-06-18 20:15:51 +03:00
Ansariel	64f80748e7	Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer	2020-05-18 21:50:17 +02:00
Mnikolenko Productengine	2e0c16492e	SL-13259 FIXED The searching word remains highlighted in the "Chat" tab	2020-05-18 13:53:18 +03:00
Ansariel	c328e340d2	Merge Firestorm LGPL	2019-05-21 19:19:06 +02:00
maxim_productengine	a985e54f03	SL-10615 FIXED Main menus drop-down lists can't be opened while searching its title	2019-02-26 11:21:07 +02:00
AndreyL ProductEngine	7953162907	SL-10614 FIXED Don't hide the tear-off menu items when filtering	2019-02-25 20:30:38 +02:00
maxim_productengine	cd859cd9e8	SL-10321 FIXED 'Uploads' tab is not displayed after any search in Preferences	2019-01-09 10:57:15 +02:00
AndreyL ProductEngine	09b750483a	SL-10293 Firestorm PR: preferences and menu search	2019-01-03 22:59:49 +02:00
Ansariel	37a1d8ef2e	FIRE-23969: Fix broken preference search since last maint RC	2019-05-09 21:47:31 +02:00