23 Commits (master)

Author	SHA1	Message	Date
Ansariel	a17fd2352a	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcharacter/llkeyframemotion.cpp # indra/llcharacter/llmotioncontroller.cpp # indra/llcrashlogger/llcrashlogger.cpp # indra/llimage/llimagetga.cpp # indra/llmessage/llregionflags.h # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/llui/llconsole.cpp # indra/llui/llkeywords.cpp # indra/llui/llscrolllistctrl.cpp # indra/llui/lltextbase.cpp # indra/llui/lltexteditor.cpp # indra/llui/llurlentry.cpp # indra/newview/llappearancemgr.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/llvocache.cpp	2024-06-09 16:11:24 +02:00
Ansariel	b42f9d836b	Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings	2024-06-01 15:49:26 +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
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
Nicky	2a03afe85c	Make GCC shut up about some warnings	2022-02-10 22:06:05 +01:00
Oz Linden	c8726aba30	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05: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
Graham Madarasz	bf6182daa8	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
Oz Linden	06b0d72efa	Change license from GPL to LGPL (version 2.1)	2010-08-13 07:24:57 -04:00
Roxie Linden	658ccc3e85	Re-insert backed out SLE checkin so we can fix it	2010-04-07 11:08:04 -07:00
Tofu Linden	0bb3f144c0	Backed out changeset 63b699f90efd	2010-04-07 10:37:07 +01:00
Roxanne Skelly	ff52ac089f	DEV-34822 viewer 1.23 merge ... DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220	2009-07-15 21:50:42 +00:00
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Steven Bennetts	da94c0eaa2	QAR-855 Viewer 1.21 RC 2 ... merge viewer_1-21 94770-96059 -> release	2008-09-12 06:27:13 +00:00
Aaron Brashears	5595a99623	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
Aaron Brashears	4942a7b779	Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.	2007-10-04 16:31:48 +00:00
Aaron Brashears	305c74d516	Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.	2007-02-02 17:28:58 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00