fc4181b478
Odd merge issue and ignore more crap.
2023-04-03 12:39:43 +01:00
57e8cd490f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-23 10:00:44 +01:00
1aa2535ae6
ignore the compiled glsl files as these should not be in version control
2022-11-05 15:01:18 +00:00
951034d7e6
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/00-Common.cmake
2022-09-17 23:14:56 +02:00
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
c333a7935d
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 19:30:31 +03:00
d42ea69ea6
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 14:03:55 +03:00
f669e46308
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 09:39:17 +01:00
105f20b055
FIRE-31326 - Fix crash thread contention crash
...
Crash caused by DD stepping and AutoTune both hacking the RenderFarClip. Added a proxy tunables structure to allow the main thread to tweak the tunables while the work is still done on the perf thread.
2022-01-30 15:48:16 +00:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
d7dea2dd7a
Ignore build-vc160-64
2021-09-24 15:21:35 -05:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
ae2a138fce
ignore vscode workspace files
2021-07-09 21:02:54 +01:00
d05ffe1693
Restore VSTool
2021-03-22 01:13:47 +01:00
1f9246f0f3
Ignore vscode generated stuff
2021-03-21 14:47:31 +00:00
68d5be3856
FIRE-30667 - Address problems highlighted by excessive group notices
...
The problem itself will be fixed server side these fixes improve general case behaviour and possibly OpenSim
2021-01-28 18:05:49 +00:00
53f447196c
Remove images from repo that get copied during the build process
2020-11-13 11:00:43 +01:00
456a79ee81
size adjustable camera floater
2020-10-12 14:59:31 +01:00
cef7c02325
Add simple script to allow parallel build of OS/SL
...
Not very clever script but avoids breaking anyone else (I hope). build_target.sh simply moves folder tress to one side making OS or SL the "target".
2020-10-10 01:39:14 +01:00
cddc7cb040
Merge branch 'rlva/development'
2020-09-19 13:31:34 +02:00
1c002e7c22
Pass address size to CMake via the platform parameter (see corresponding change in our autobuild)
2020-07-21 23:38:44 +02:00
d11fee37b3
Merge branch 'lindenlab/release' into viewer/build
2020-07-21 23:34:11 +02:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
cb4b95b87b
Merge branch 'lindenlab/release' into viewer/build
2020-06-27 11:11:00 +02:00
77cf4588df
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
...
following release of D512.
2020-06-23 22:03:43 -04:00
1bc3d1a186
Merge branch 'lindenlab/release' into viewer/build
2020-06-09 15:33:40 +02:00
7c7e3ae8ba
Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476
2020-06-03 19:28:05 +02:00
1b102c57db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-03 12:30:37 +02:00
d4a38abdf5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
2020-06-02 13:13:53 -07:00
50a8c2e41a
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
2020-06-02 16:05:56 -04:00
800eedb195
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-02 21:55:22 +02:00
77f56fa7bf
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
2020-05-31 15:27:02 +02:00
4f634176dc
Add .tar.bz2 to .gitignore.
2020-05-30 01:36:09 +02:00
27715d4d03
Merge remote-tracking branch 'll/d476' into fs-eep-vs2017-d476
2020-05-21 06:54:02 +02:00
27efc55cdb
Nonsensical, trivial change to force a build after I ran afoul of a TeamCity buildscripts change
2020-05-04 14:24:28 -07:00
a4aff377e6
Merge branch 'master' into fs-vs2017
2020-04-29 20:02:19 +02:00
bc91debfd7
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
2020-04-10 18:37:27 +02:00
cb4ca2e41e
Ignore build-vc150-* directories as those are the VS2017 build dirs (n.b. due to the rather strange version numbering of VS this really should be build-vc141-*; as VS2017 is vc141 internally).
2020-03-25 18:44:04 -04:00
9afa7696c7
Merge branch 'lindenlab/release' into viewer/build
2020-02-08 14:32:47 +01:00
e76f25d25f
SL-11445 Couple small fixes
2020-02-04 16:19:20 +02:00
da41ae4917
Great job again, Git...
2020-01-29 00:05:10 +01:00
c8e0721bf5
Merge DRTVWR-496
2020-01-28 18:18:12 +01:00
1069673311
Convert ignore file to git, add a .clang-format rules file
2020-01-10 16:27:33 -07:00
f29362298c
Replace .gitignore with merged LL version
2020-01-08 18:04:40 +01:00
391976ffb2
Convert ignore file to git, add a .clang-format rules file
2020-01-07 15:34:08 -07:00
7c9e7f4c03
Ignore *.orig files.
2019-12-29 20:56:12 +01:00
9e0bbc4e10
Post-git conversion changes
2019-12-23 02:08:12 +01:00
Beq