Bennett Goble
|
ffc6ed2a93
|
SL-18218: Switch canonical_repo to GitHub URL
|
2022-10-17 13:22:56 -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 |
|
Andrey Lihatskiy
|
77ce594dec
|
Merge branch 'master' into DRTVWR-544-maint
|
2022-06-29 20:31:17 +03: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 |
|
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 |
|
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 |
|
Andrey Lihatskiy
|
2dd192ce36
|
DRTVWR-540 Updated LLCA to CT build 567974
|
2022-02-01 18:54:48 +02:00 |
|
Nat Goodspeed
|
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 |
|
Andrey Kleshchev
|
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 |
|
Andrey Lihatskiy
|
6c029e4858
|
DRTVWR-533 Updated LLCA to CT build 567162
|
2022-01-11 02:30:30 +02:00 |
|
Andrey Lihatskiy
|
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 |
|
Howard Stearns
|
9ee93d36ba
|
SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following commit message changes there.
|
2022-01-06 15:50:25 -08:00 |
|
Howard Stearns
|
9e30beb534
|
SL-13297 - bad copypasta
|
2022-01-06 15:44:48 -08:00 |
|
Howard Stearns
|
183261bc64
|
SL-13297 - Use new teamcity slvoice.
|
2022-01-06 15:44:30 -08:00 |
|
Andrey Lihatskiy
|
970b6661cd
|
Merge branch 'master' into DRTVWR-543-maint
|
2021-12-26 14:01:17 +02:00 |
|
Andrey Lihatskiy
|
747dbb7da2
|
Merge branch 'master' into DRTVWR-540-maint
|
2021-12-26 14:01:06 +02:00 |
|
Andrey Lihatskiy
|
83b4ea59fc
|
Merge branch 'SL-15742' into DRTVWR-527-maint
|
2021-12-16 00:58:44 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |