95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
a0c7370ce3
Update Havok
2022-06-03 20:26:02 +02:00
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
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# 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 11:41:45 +02:00
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
14e3104f86
SL-17452 Fixed anscii usage dullahan side
2022-05-21 01:11:38 +03:00
a4d60d06ec
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-05 10:43:31 +02:00
7991aaffa0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-05 09:59:12 +02:00
6e83be2167
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-29 14:27:09 +02:00
5b7825df1e
Update SDL2.
2022-04-25 21:25:46 +02:00
e5f684f085
Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still.
2022-04-25 21:24:29 +02:00
15354e86ba
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-04-21 14:27:51 +02:00
c944641900
SL-17240 slvoice notarization fix
2022-04-20 02:14:27 +03:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
2daf0cb2fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-19 14:24:09 +02:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
1aaa765d26
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 12:33:48 +02:00
ad0aa3422f
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-04-19 00:23:41 +02:00
07040f7eb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 00:15:01 +02:00
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
ca839307f9
Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake
2022-04-18 19:57:34 +02:00
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
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
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
34b5c5e890
Switch to USE_OPENAL
2022-04-16 23:01:00 +02:00
94973e736c
SL-17224 Update FMOD to version 2.02.06
2022-04-15 21:27:50 +03:00
d898151f25
Linux; update glib, fmodstudio and kdu
2022-04-01 15:25:40 +00:00
ae4f64eee7
SL-17079: Merge 'sl-17079' into DRTVWR-546 for Mac updater fix.
2022-03-28 16:45:22 -04:00
9e2f571687
SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix.
2022-03-28 16:43:22 -04:00
4ae2ce7d92
Update FMOD Studio to 2.02.06 on Mac
2022-03-28 17:19:25 +02:00
2a4cecdc6c
Update FMOD Studio to 2.02.06 on Windows
2022-03-28 11:15:02 +02:00
9d7f8156c6
SL-17079: Update to viewer-manager build 569958
2022-03-25 15:53:28 -04:00
b79d1ac171
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-08 14:19:36 +01:00
ae4a769345
Update 3p for voice again, remove some so's that causes problems.
2022-03-06 20:07:45 +01:00
3e1619d2fc
SL-14541 Pull in updated collada
2022-03-05 22:52:00 +02:00
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
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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-02 10:12:19 +01:00
de70b18dd1
Linux; Update slvoice, include 32 bit libs.
2022-03-01 22:44:44 +01:00
892500ee41
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2022-03-01 19:34:34 +01:00
d34e3a9ab4
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-03-01 19:31:32 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
e10dea5fe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 18:09:12 +01:00
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
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
fa9d4927f4
Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
2022-03-01 02:59:15 +02:00
43031968a6
Merge remote-tracking branch 'll/master'
2022-02-28 22:04:05 +01:00
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
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
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
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
0bd3e3d53a
Merge branch 'linux_crashlogger'
2022-02-21 08:14:04 +01:00
7dd7abf396
Bring back gstreamer, remove the old and unmaintained Linux VLC version.
2022-02-20 21:24:37 +01:00
2db46702c4
Linux; Update curl
2022-02-20 20:46:18 +01:00
4a311d6266
Bring back llappearance_utility.
2022-02-18 21:19:06 +01:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
2baf4589ff
Merge branch 'DRTVWR-553-555' of https://bitbucket.org/lindenlab/viewer
2022-02-16 09:47:28 +01:00
a6430f42f3
SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555
2022-02-15 16:11:59 -05:00
f09b0a6a08
SL-16842, SL-14300: Update to viewer-manager build 568552
2022-02-15 16:10:36 -05:00
ee4249378a
Spring cleaning, remove all traces of old 32 bit darwin/linux packages.
2022-02-11 22:11:18 +01:00
7491a56144
SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix.
2022-02-11 13:58:49 -05:00
78e32d943e
SL-16842: Update to viewer-manager build 568451
2022-02-11 13:58:04 -05:00
31e8e6fac0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-10 12:42:15 +01:00
75256ae308
Merge with boost update
2022-02-09 23:05:16 +01:00
c7f39b5043
Linux; bring back breakpad. No upload to bugsplat implemented yet.
2022-02-09 23:04:31 +01:00
0700482f66
Update boost and colladadom with packages build on Bionic Beaver, good bye Xenial Xerus old friend, you served us well over the years.
2022-02-09 21:57:11 +00:00
afab8d6628
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-09 10:00:27 +01:00
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
846413c961
DRTVWR-555: Update to viewer-manager build 568310
2022-02-08 20:08:42 -05:00
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
2672518740
Update dullahan to a SDL2 compatible version.
2022-02-07 11:33:33 +01:00
e37f8c6020
SL-16788: Update to viewer-manager build 568156
2022-02-04 11:58:53 -05:00
ca26bb40ce
SL-16787 Updater launch issues.
2022-02-04 01:36:47 +02:00
1de684a8ea
SL-13792: Update to viewer-manager build 568036
2022-02-02 11:33:03 -05:00
472f4c0c73
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 12:24:32 +01:00
abe4857fd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 10:13:39 +01:00
f669e46308
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-02 09:39:17 +01:00
a0dcfeb10e
SL-13792: Update to viewer-manager build 568005
2022-02-01 16:34:51 -05:00
7b6269fd10
SL-13792: Update to viewer-manager build 567997
2022-02-01 14:43:57 -05:00
2dd192ce36
DRTVWR-540 Updated LLCA to CT build 567974
2022-02-01 18:54:48 +02:00
91743a9dfa
SL-13792: Use new Python 3 SLVersionChecker.
...
On Mac, execute the packaged SLVersionChecker directly rather than invoking
system Python on our manually-bundled scripts.
2022-01-31 18:07:42 -05:00
ba31ac8efe
Remove old dbus code and replace it with a glib/gio implementation.
2022-01-27 22:00:35 +01:00
08fe29a658
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-22 11:46:16 +01:00
f3d96c7309
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-18 15:56:56 +01:00
a79e426c6b
Merge branch 'linux_fltk' to get rid of gtk/pango/atk/... 3p
2022-01-17 18:26:42 +01:00
7a8b63be87
Tabs to spaces.
2022-01-16 13:14:53 +01:00
d031507caa
Update FMOD Studio to 2.02.05 (Mac)
2022-01-16 01:24:02 +01:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
78f9a28191
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2022-01-13 21:12:09 +01:00
c741ba7cff
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-13 21:10:06 +01:00
f8441963fc
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
...
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater.
2022-01-13 21:27:14 +02:00
61e5557d64
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-12 16:47:37 +01:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
de7b3b081e
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2022-01-11 08:58:39 +01:00
6c029e4858
DRTVWR-533 Updated LLCA to CT build 567162
2022-01-11 02:30:30 +02:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
453c99af39
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:15:08 +01:00
81f2d2dc47
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:13:54 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
f47ab322c0
Merge branch 'master' into linux_fltk
2022-01-10 14:00:42 +01:00
2fc0bb8979
Merge remote-tracking branch 'origin'
2022-01-10 13:47:43 +01:00
f9fa1475a8
Linux; Update to fmodstudio 2.02.05
2022-01-10 13:43:51 +01:00
290f23a548
Update FMOD Studio to 2.02.05 on Windows
2022-01-10 12:12:37 +01:00
d34e4fc7bf
Merge branch 'master' into linux_fltk
2022-01-10 09:31:04 +01:00
9ee93d36ba
SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following commit message changes there.
2022-01-06 15:50:25 -08:00
9e30beb534
SL-13297 - bad copypasta
2022-01-06 15:44:48 -08:00
183261bc64
SL-13297 - Use new teamcity slvoice.
2022-01-06 15:44:30 -08:00
d65b5a868f
It's 2022...
2021-12-31 14:42:20 +01:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
0953b6b646
Merge branch 'master' into linux_fltk
2021-12-21 00:39:10 +01:00
b7fd7a0cfb
Linux; new JS packages needed for 360 snapshot viewer.
2021-12-17 14:06:47 +01:00
d392b46984
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-17 09:21:55 +01:00
94498d9a32
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-12-17 08:27:06 +01:00
38d21f99fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-17 08:26:39 +01:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01: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
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
a3c1080295
Merge branch 'DRTVWR-552-cache-360' of https://bitbucket.org/lindenlab/viewer
2021-12-15 21:05:24 +01:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
2800905ac3
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
...
+resolved viewer-manager's inherited conflict
2021-12-15 21:36:58 +02:00
aa309c2eef
updated viewer-manager after merge
2021-12-15 21:23:03 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
ee554834b8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-15 19:31:19 +01:00
e5f5e08de3
Update Mac FMOD Studio to v2.02.04
2021-12-15 17:27:33 +01:00
f34682962d
Linux; Update FMOD Studio to 2.02.04
2021-12-12 14:04:49 +01:00
0b95b9d008
Merge branch 'master' into SL-15742
2021-12-11 10:29:37 -08:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
4cc5b249d8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-10 15:47:34 +01:00
0451952a8f
Update FMOD Studio to 2.02.04 on Windows
2021-12-10 15:44:27 +01:00
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
850767eb21
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-29 21:55:45 +02:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
98b416ff5c
SL-16396 Updater fails with "takes exactly 3 arguments" error
2021-11-23 22:56:05 +02:00
d958cc2fdf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-20 21:06:54 +01:00
ece7c98446
Set the correct version
2021-11-19 09:44:24 +01:00
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
9a1af101cd
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
472509dff4
SL-16235 Update fmod to 2.02.03
2021-11-18 20:35:42 +02:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
5ccdcf51a3
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
2021-11-16 02:22:54 +02:00
Nicky