f9f11a7782
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 18:40:01 +02:00
08e171247e
Update German translation
2022-04-19 18:38:16 +02:00
fbb6b25677
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
2022-04-19 18:36:48 +02:00
459a8861cf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 17:36:39 +02:00
d64cda29bf
Update German translation
2022-04-19 16:06:39 +02:00
9dee43cf46
Re-apply SL-15400 Menu item "Pause Clouds" should not pause water
2022-04-19 16:03:50 +02:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
0cdd55fd24
Update German translation
2022-04-19 15:29:59 +02:00
ac2ee57edb
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lllocationinputctrl.h
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/viewer_manifest.py
# indra/viewer_components/login/lllogin.cpp
2022-04-19 15:27:35 +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
2445525cc5
SL-17231 Copying textures should be disabled if object content was not yet updated
2022-04-19 02:33:59 +03: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
b5406352e9
DRTVWR-548 post-merge build fix
2022-04-19 00:01:52 +03: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
ea0c810d2d
SL-15312 Small tweaks for profiles
2022-04-18 23:39:21 +03:00
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
8a39aaa3a4
SL-15312 Legacy profiles remake #10
...
Fixed Typo
changed 'show in search' checkbox into combobox, implemented commit
Fixed fl textbox setting sl text instead of fl text
Fixed fl save/discard buttons not following resize
2022-04-18 22:21:58 +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
a0ec6fd371
Merge branch 'master' into DRTVWR-486
2022-04-18 20:39:47 +03:00
65ea8e1351
Merge branch 'master' into DRTVWR-483
2022-04-18 20:39:18 +03:00
16494f4400
Merge branch 'master' into DRTVWR-548-maint-N
2022-04-18 20:38:56 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
d031662435
Increment viewer version to 6.5.5
...
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
2b151e0aef
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
2022-04-18 18:11:43 +02:00
dcfb94fbac
- More include changes for xmlrpc.h
...
- New versions of curl have the same value for CURLE_SSL_PEER_CERTIFICATE and CURLE_SSL_CACERT
2022-04-18 18:05:37 +02:00
0319ed6611
Another instance where LLFilePicker::getSaveFile had the wrong number of arguments.
2022-04-18 17:05:31 +02:00
51e5437721
Use correct namespace for bind, must be phoenix::bind or there is confusion with boost::bind
2022-04-18 17:00:35 +02:00
9bbd038733
in case of systemlibs (conan right now), xmlrpc header structure is slightly different.
2022-04-18 16:52:39 +02:00
29ca856038
llrender does not need a dependency on sdl. There was some comment out code which
...
suggests it was needed long ago.
2022-04-18 16:50:17 +02:00
bacbf1ffe6
ASN1_STRING_data is depreacted.
2022-04-18 16:49:17 +02:00
46402bd527
Correctio for preproc #else
2022-04-18 16:48:39 +02:00
b532c2986b
Add argument missing from implementation
2022-04-18 16:47:54 +02:00
7038e3e358
Use correct type
2022-04-18 16:46:59 +02:00
7a66e77694
Remove some remnants of breakpad.
2022-04-18 03:44:09 +02:00
da24787167
Enable LL_OS_DRAGDROP_ENABLED for Linux
2022-04-18 03:43:42 +02:00
98ef249470
Need to use list( APPEND ... to append to a list.
2022-04-18 03:42:26 +02:00
5aa81b1659
Remove obsolete targets and dependencies.
2022-04-18 03:14:49 +02:00
e180278477
zlib-ng for Linux is still broken. This needs revisiting, but at least gets up compiling for now.
2022-04-18 03:13:39 +02:00
defdbaf40d
Fixup for Linux media plugins.
...
- Remove VLC
- Remove missing cmake includes (that got deleted in earlier changes) from gstreamer plugin.
2022-04-18 03:12:19 +02:00
a9f4e88a30
Introduce ll::fontconfig target (missing the correct link library, but at least this gets us compiling)
2022-04-18 03:10:54 +02:00
d65a5832bf
ll::sdl had a wrong include directory.
2022-04-18 03:10:02 +02:00
4416db9a26
Remvoe -D that had been passed in front of each entry of add_compile_definitions, this lead to '-D-D<value>'
2022-04-18 03:08:46 +02:00
e743efcc48
- Change OpenAL to OPENAL to match the correct filename, Windows and OSX use case insesitive fielsystem, this is why it was not issues there
...
- Remove input files that are obsolete.
2022-04-18 03:05:06 +02: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
1966d837e1
jsoncpp includepath should not include json/. jsoncpp includes a header "features.h"
...
which has the same name as a glibc header, allowing this header to be found without any prefix
will lead to head conflicts when there is a '#include "features.h"'
As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-18 02:50:43 +02:00
Ansariel