Commit Graph

48 Commits (a455d3ee7d5ddefcdf008fa86ecc7c80aba758aa)

Author SHA1 Message Date
Rye a455d3ee7d Introduce build system and preprocessor support for ARM64 2025-02-11 05:04:08 -05: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
Ansariel 0a42ed6cc5 Remove orphaned 32bit Windows code from slplugin.cpp 2024-02-20 02:14:01 +02:00
Lars Næsbye Christensen fbc4c9e31f replaces deprecated (since 10.12) reference to NSAnyEventMask with the replacement NSEventMaskAny. Functionality unaltered. 2023-07-21 00:25:07 +02:00
Nicky 767464a262 Adapt gnerator expression usage to work on OSX. 2022-05-07 02:19:51 +02:00
Nicky 283c2a20cc Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
sets the property on those.
2022-05-01 00:38:40 +02:00
Nicky 2c3507a9d2 Cleanup plugin, create proper target for link libraries. Remove unused
variables.
2022-04-16 19:58:17 +02:00
Nicky b9f94c0897 Now there is a oslibrary target get rid of some more obsolete vars:
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16 15:33:32 +02:00
Nicky bb85651d98 Create a new target ll::oslibrary to link against libs specific to the OS compiled on.
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-16 15:29:02 +02:00
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1.
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
Anchor b5bb0794f0 [DRTVWR-476] - fix linking 2020-03-25 18:39:20 -04:00
Oz Linden 9fd463bd94 remove only-partially-successful attempt to put teamcity blocks around targets 2018-09-07 09:13:57 -04:00
Oz Linden 49c483eeb3 add more block structure to TeamCity log output for components 2018-09-05 18:07:35 -04:00
Oz Linden d7c8678c3a merge 5.1.0-release 2018-01-17 12:43:28 -05:00
Callum Prentice 95c7feba07 Remove the scary 32bit exception handler that patches kernel32.dll since it was (a) scary, (b) didn't work on 64 bit and (c) likely the cause of a lot of anti-virus false positives 2017-04-19 15:54:26 -07:00
Oz Linden 0a7fd3686a Look for logcontrol-dev.xml in the user settings directory 2017-02-27 09:52:50 -05:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Rider Linden 28921896f1 OPEN-312: Removed add_dependency entries for items listed in target_link_libraries. Superfluous. 2016-01-20 16:08:33 -08:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
callum_linden ab9e830306 Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin 2015-03-24 00:42:42 +01:00
callum_linden e6bfaa3d5b Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error 2014-10-17 16:02:50 -07:00
simon 71e2efab16 Merge downstream code - Vivox release 2013-08-05 14:50:40 -07:00
Aura Linden ce9962b338 Merged in viewer-release 2013-07-11 17:49:13 -07:00
Aura Linden 8642f57dd9 Removed debugging. 2013-05-16 10:31:33 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon 291b387178 Cmake doesn't like me 2013-05-02 15:36:26 -07:00
simon 299433c544 Fix the cmake fix 2013-05-02 15:13:05 -07:00
simon 104f576400 Fix Windows Debug build 2013-04-23 16:27:24 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Aura Linden 2282d6b11a Fixed whitespace issues for merge. 2012-12-13 12:24:17 -08:00
Aura Linden eca6199852 Ported slplugin and some other missing components for cocoa. 2012-11-12 18:06:32 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Boroondas Gupte 11996e9dd7 merged SNOW-651: Added missing "if (LL_TESTS)" in indra/llplugin/slplugin/CMakeLists.txt 2010-10-12 10:14:28 +02:00
Boroondas Gupte (original fix by Techwolf Lupindo) 5bcfa063b4 SNOW-651: Added missing "if (LL_TESTS)"
Daggified version of http://svn.secondlife.com/trac/linden/changeset/3523
(or of the SNOW-651 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )
2010-10-04 23:01:43 +02:00
Aimee Linden ce84d6707a STORM-253 FIXED FrontWindow() API is deprecated 2010-09-27 12:33:36 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Monroe Linden fd799ca57e Fix for EXT-8089 (Log spam from SLPlugin about "autoreleased with no pool in place - just leaking")
Added slplugin-objc.mm.

Made SLPlugin do the cocoa setup during initialization, and create/delete an
autorelease pool each time through its main loop.  This should make plugin code
that's using autorelease correctly not leak.

Fixed a bug in the version of setupCocoa() used in the viewer (it was never
setting its "inited" variable).
2010-06-25 14:18:22 -07:00
Aimee Linden 0cdaca2b46 DEV-49389 (SNOW-571 / VWR-18279): Replacing another deprecated WaitNextEvent() for the OS X 10.6 SDK
Replaced the deprecated WaitNextEvent() call with ReceiveNextEvent() and SendEventToEventTarget() as a basic event loop in slplugin.cpp
2010-04-25 03:49:55 +01:00
Monroe Linden 144b8349b3 Fix for EXT-6287 (fullscreen flash video plays behind the viewer instead of in front)
Made SLPlugin into a bundled app on the Mac (this is apparently necessary for the plugin's window to be allowed to get focus).

Changed the Info.plist key SLPlugin uses to keep itself out of the dock from LSBackgroundOnly to LSUIElement (this allows it to get focus and display UI).

Added some Mac-specific code to slplugin.cpp to manipulate window layers and bring the plugin process to the foreground when something in the process opens a window, and to bring the viewer to the foreground when the last window in the process is closed.
2010-04-21 17:04:27 -07:00
Tofu Linden 73665e5ad6 CID-1
Checker: BAD_COMPARE
Function: checkExceptionHandler()
File: /indra/llplugin/slplugin/slplugin.cpp

(not a bug, but rearranged a little)
2010-01-27 11:59:55 -08:00
bea@american.lindenlab.com 199d42f274 doxygen: exclude licensing blurbs 2009-11-30 14:46:35 -08:00
callum cf8b851061 Fix for DEV-42324 (Default exception handler still called sometimes for SLPlugin)
Added some code from an online article to patch the CRT and disable all default
exception handling.
2009-11-25 14:52:22 -08:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00