1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
d5501d459b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-01 11:36:10 +02:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
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
e0cf0cdfd4
Switch to target_include_directories
...
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
924fa0fa78
create target ll::uilibraries to have one common target that defines what each
...
operation system needs as dependencies on OS gui libraries.
2022-04-16 17:28:26 +02:00
d1b6a52fef
Googlemock target
2022-04-06 23:33:06 +02:00
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
9e415cdbb2
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-05-25 11:03:48 +02:00
86009f885e
SL-10297: merge up to master at 6.4.3
2020-06-15 15:29:04 -04:00
e409c0492f
convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach
2019-03-02 11:58:11 -05:00
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
5560f13b4b
Merge axon
2018-06-07 19:15:42 +02:00
228525aa27
SL-915 - tracking joint is rigged state
2018-06-04 14:43:06 +01:00
e86839fac1
SL-915 - WIP on dynamic joint box tracking
2018-06-01 15:08:59 +01:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
8dc81d0f94
Seems like somebody forgot to add this...
2017-11-16 15:41:42 +01:00
c04ceedbc3
Baseline for settings changes
2017-09-19 15:50:30 -07:00
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
80a878a792
DRTVWR-418: Merge from v-r makes llmath tests need Boost.Thread.
2017-02-04 08:54:01 -05:00
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
b4e7faee77
FIRE-13814; Octree fixing.
...
- Do not create octree children that can cause precision problems.
- Error out when trying to put more than 8 children into a parent. That would just overwrite memory.
- Add logging for hte future.
2014-05-27 14:46:02 +02:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
a039b7c489
Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some libraries
2012-10-11 13:29:36 -04:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
e62ad2bf13
SH-2789 WIP - tests for alignment
2011-12-15 19:26:03 -05:00
db7924681d
SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al)
2011-11-08 17:46:43 -06:00
c47d42d945
STORM-1315 Ability to do simple math in numeric edit fields
2011-06-29 23:40:20 -07:00
45df2d70f0
More line endings.
2010-08-19 13:08:57 -05:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
9a869d6301
Octree triven raycast works, time to profile.
2010-05-29 19:55:13 -05:00
a2eb86b009
Ack. Fixed a bunch of stupid type mistakes in llvector4a.
2010-05-24 13:37:59 -07:00
3858992603
Add CMake var LL_TESTS to optionally disable tests for build timing
2009-11-27 22:24:57 -08:00
3e10fa4d51
merge from latest svn/viewer-2-0 to hg/viewer-2-0
2009-10-16 16:42:45 -07:00
4a8c59bd96
DEV-41368 resurrect dead m3math tut test, convert it to a llmath integration test.
2009-10-15 18:58:23 +00:00
f31397291b
DEV-41345 turn llmodularmath_tut into a real llmath unit test.
2009-10-15 16:59:54 +00:00
6af0219273
DEV-41080 fix and upgrade v4color_test.cpp to a real unit test.
2009-10-08 16:44:44 +00:00
50e3b3373b
DEV-41080 - wriggle some method implementations out into header implementations, just enough so that llbboxlocal can be a unit test rather than an integration test. Slightly dubious about whether it's worth it.
2009-10-08 16:31:28 +00:00
ac63aaf7d8
DEV-41080
...
The unit testing framework itself doesn't (shouldn't) depend upon llmath, so relax that dependancy when we're actually testing llmath itself.
This makes llmath unit-testable.
Subsequently, upgrade some of the llmath Integration tests to something much closer to Unit tests (hooray).
2009-10-08 15:48:05 +00:00
6ee4a7f429
DEV-41089 convert legacy tut llrect test into a llmath integration test.
2009-10-08 13:46:20 +00:00
5fe65644b5
DEV-41088 convert legacy 'math' test module into 'mathmisc' integration test.
2009-10-08 13:36:46 +00:00
cb70d7e848
DEV-41087 more llmath test conversions from legacy tut tests.
2009-10-08 12:50:02 +00:00
Ansariel