05436e76d7
Updated Polish translation
2022-10-22 21:29:10 +02:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
791b7ff0e9
SL-17585 Don't bother users with dialogs if we are already quiting
2022-06-20 17:07:49 +03:00
9e003e13c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-06-18 15:50:56 +02:00
9f3e815adc
SL-17585 Ensure nothing went wrong with installation during 'File' operations
2022-06-17 20:53:11 +03:00
75668d4522
SL-17585 Crash at LLAppViewer::initConfiguration
2022-06-17 00:35:32 +03:00
85e0c4b7ba
Correct bundle id for OSX signing.
2022-06-15 19:42:36 +02:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
411f15635f
Do not copy all 32 bit dynamic sos as this causes problems with output device enumeration.
...
This will cause issues with the AppImage, so disable creation of the Appimage.
2022-04-03 17:52:20 +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
c5e258f40f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 08:38:19 +01:00
3ad6b91c4f
Fix packaging fail in case system canot create a app image (not ubuntu)
2022-02-28 00:21:45 +01:00
828fbdc571
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
2022-02-02 10:37:33 +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
94daedaaed
SL-16681 Better handling of locked files by NSIS Installer
...
1. When SL window closes it doesn't mean that process died so gave it a bit more time to terminate
2. Added a retry logic in case first run happened too early for some reason
3. Replaced ok/cancel on locked file with abort/retry/ignorei
2022-01-31 16:59:35 +02:00
43ae70c1d8
Wire up creation of Appimage. Maybe later rework this, make appimage.sh be standalone and just
...
accept the tarball as arument, extract and hten bundle. Then it could be called in a step after
viewer_manifest.py
2022-01-31 11:35:16 +01:00
070b48e5d3
AppImage creation script for Linux
2022-01-31 01:23:02 +01:00
5fcb811aa2
SL-16630 Notarization script update
2022-01-19 12:05:20 +02:00
78f9a28191
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2022-01-13 21:12:09 +01:00
54ec5e8ff3
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-01-12 23:42:38 +01:00
efe9f0e865
Merge branch 'master' into DRTVWR-553-maint-mix-JK
2022-01-12 23:32:18 +02:00
84d989acac
SL-11875 Verbose log
2022-01-11 23:53:26 +02:00
39f272278c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp
2021-12-16 10:20:56 +01:00
d958cc2fdf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-20 21:06:54 +01:00
0ea48beb15
When did the case get lost???
2021-11-18 18:00:45 +01:00
c7b029d6d1
Delete the correct default cache folder on 64bit versions
2021-11-18 17:48:58 +01:00
bb3885fc45
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-16 15:49:39 +01:00
171c00d0bb
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-28 12:48:13 +02:00
3614083377
SL-16121 Fix intaller complaining about missing string
2021-10-25 21:11:43 +03:00
e4cac17f3d
SL-16121 Fix viewer not cleaning up obsolete plugin modules on install
2021-10-25 19:35:18 +03:00
fb170ffe21
Merge branch 'master' into DRTVWR-545-maint-mix
2021-10-14 00:35:08 +03:00
111fdfb897
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-10-12 14:33:22 +02:00
bff236d893
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 14:27:41 +02:00
3848d410c0
OSX; Rework installer, make the winow smaller, update the backround. Remove VixoxAUP and LGPL license but rather put them into the installed package.
2021-10-10 10:05:44 -04:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
f2582cacf7
SL-15612 Value fix
2021-09-21 19:42:43 +03:00
30c0043ba3
SL-15612 Check for SKIP_NOTARIZATION evn. variable
2021-09-21 19:37:15 +03:00
e3e2904847
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2021-08-24 14:57:18 +02:00
54171dbc9f
SL-15585 more logging for altool
2021-07-19 18:58:04 +03:00
11635dc5b8
SL-15585 typo fix
2021-07-15 00:58:07 +03:00
b58fb17582
SL-15585 Improved notarization error handling
2021-07-14 23:35:45 +03:00
76b932e008
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-05-02 01:06:17 +02:00
02405a74d2
DRTVWR-520 Post-merge build fix + error handling improvement
2021-05-01 02:05:06 +03:00
789be6b933
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-04-30 03:05:19 +03:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
487685fef1
DRTVWR-520 Safety check; remove temporary zip file
2021-04-29 08:07:24 +03:00
2f7e9aac00
buildfix (chmod a+x)
2021-04-29 06:21:04 +03:00
bd4ad276c0
DRTVWR-520 Notarize the viewer on TeamCity
2021-04-29 04:57:05 +03:00
98f8912e25
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-01 16:49:55 +02:00
PanteraPolnocy