livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,889 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1636 Commits (1eb55b3d8e3d64f8f02bc18685e46ff42ca77cec)

Author SHA1 Message Date
Nat Goodspeed 1eb55b3d8e SL-18837: Update apr_suite to release v1.7.2.91ae6ee. 2023-05-15 09:19:19 -04:00
Signal Linden 937495863c Build on 16-core machine 2022-10-12 15:02:02 -07:00
Signal Linden f85120e0bf Consistently use msbuild not devenv in autobuild.xml 2022-10-12 14:00:59 -07:00
Signal Linden 67512f0ddb Remove hard-coded toolsversion from autobuild.xml build command 2022-10-11 12:13:33 -07:00
Callum Linden 7018deb7f8 SL-18289: Modify autobuild.xml to insert a CMaker architecture flag as well as the generator string for Windows builds 2022-10-03 11:31:44 -07:00
Andrey Kleshchev c333a7935d SL-17238 Fixed llphysicsextensions connection to llrender 2022-09-17 19:30:31 +03:00
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07:00
Callum Linden 3248eb87dc SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin 2022-09-14 14:52:31 -07:00
Callum Linden ef58b9751a DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming 2022-08-30 15:20:04 -07:00
Callum Linden 35de5fc912 SL-18021 Generate a VS 2019 build of the Viewer using current third party libraries: replace hard coded VS 2017 '150' maginc number with another magic number - for VS 2019 2022-08-25 10:04:02 -07:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Nicky 95d5938eef Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-06-05 14:27:28 +02:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Andrey Lihatskiy a426e8ddb3 DRTVWR-543 post-merge cleanup 2022-05-27 19:05:14 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 02:51:33 +03:00
Andrey Kleshchev 14e3104f86 SL-17452 Fixed anscii usage dullahan side 2022-05-21 01:11:38 +03:00
Andrey Lihatskiy c944641900 SL-17240 slvoice notarization fix 2022-04-20 02:14:27 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Nicky ca839307f9 Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-04-18 19:57:34 +02:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Nicky 54f8d5c380 Bring in first steps of Linux64: 
- Add the configuratons Release and ReleaseOS
- The js files are platform independent, just copy the ones from windows64.
 2022-04-18 03:02:50 +02:00
Nicky 34b5c5e890 Switch to USE_OPENAL 2022-04-16 23:01:00 +02:00
Andrey Kleshchev 94973e736c SL-17224 Update FMOD to version 2.02.06 2022-04-15 21:27:50 +03:00
Nat Goodspeed ae4f64eee7 SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix. 2022-03-28 16:45:22 -04:00
Nat Goodspeed 9e2f571687 SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix. 2022-03-28 16:43:22 -04:00
Nat Goodspeed 9d7f8156c6 SL-17079: Update to viewer-manager build 569958 2022-03-25 15:53:28 -04:00
Andrey Kleshchev 3e1619d2fc SL-14541 Pull in updated collada 2022-03-05 22:52:00 +02:00
Andrey Kleshchev 51e318fd8d SL-14541 Pull in updated zlib-ng 
Nicky Dasmijn's contribution for zlib-ng Linux builds
 2022-03-05 11:34:13 +02:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Andrey Lihatskiy fa9d4927f4 Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
 2022-03-01 02:59:15 +02:00
Nicky 43031968a6 Merge remote-tracking branch 'll/master' 2022-02-28 22:04:05 +01:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Andrey Lihatskiy 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Nicky 4a311d6266 Bring back llappearance_utility. 2022-02-18 21:19:06 +01:00
Nat Goodspeed a6430f42f3 SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555 2022-02-15 16:11:59 -05:00
Nat Goodspeed f09b0a6a08 SL-16842, SL-14300: Update to viewer-manager build 568552 2022-02-15 16:10:36 -05:00
Nicky ee4249378a Spring cleaning, remove all traces of old 32 bit darwin/linux packages. 2022-02-11 22:11:18 +01:00
Nat Goodspeed 7491a56144 SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix. 2022-02-11 13:58:49 -05:00
Nat Goodspeed 78e32d943e SL-16842: Update to viewer-manager build 568451 2022-02-11 13:58:04 -05:00
Nat Goodspeed 9bd45e6fab SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555. 
This picks up the change to 32-bit Windows viewer-manager.
 2022-02-08 20:09:52 -05:00
Nat Goodspeed 846413c961 DRTVWR-555: Update to viewer-manager build 568310 2022-02-08 20:08:42 -05:00
Andrey Lihatskiy 967707cfd0 Merge branch 'DRTVWR-555' into DRTVWR-553+555 
# Conflicts:
#	autobuild.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/viewer_manifest.py
 2022-02-08 23:22:59 +02:00
Nat Goodspeed e37f8c6020 SL-16788: Update to viewer-manager build 568156 2022-02-04 11:58:53 -05:00
Andrey Kleshchev ca26bb40ce SL-16787 Updater launch issues. 2022-02-04 01:36:47 +02:00
Nat Goodspeed 1de684a8ea SL-13792: Update to viewer-manager build 568036 2022-02-02 11:33:03 -05:00
Nat Goodspeed a0dcfeb10e SL-13792: Update to viewer-manager build 568005 2022-02-01 16:34:51 -05:00
Nat Goodspeed 7b6269fd10 SL-13792: Update to viewer-manager build 567997 2022-02-01 14:43:57 -05:00