719a2d31dc
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llui/llscrolllistctrl.h
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
12e044755e
SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml)
2023-04-10 17:01:10 -07:00
9825c45335
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/ViewerMiscLibs.cmake
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-04-05 10:56:12 +02:00
28b240fd7f
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-04-03 14:58:58 -07:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
40b731eb76
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
...
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
9e3079f859
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontregistry.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/widgets/chat_editor.xml
2023-01-23 16:49:24 +01:00
e60eb81d56
Linux: use system wide fontconfig instead of 3p library, if all goes well we can later remove it from autobuild.xml - patch by PorkChop, thank you!
2023-01-19 12:38:02 +01:00
58a329be66
Merge branch 'DRTVWR-489-emoji' into DRTVWR-489-emoji
2022-11-16 20:16:28 +01:00
24bd7b2311
Add support for OT-SVG fonts
2022-11-06 16:25:35 +01:00
45aef2c318
Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled
2022-09-20 19:29:39 +02: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
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
d3521b4462
Remove obsolete and unmaintained USE_SYSTEMLIBS
2022-04-13 10:28:46 +02:00
0fd687f43d
FIRE-29405: Back out remaining changes from FIRE-22709
2020-03-18 21:42:08 +01:00
4e2b2f662a
Update freetype to 2.10.1 and move viewer fonts to their own package
2019-10-20 23:45:52 +02:00
0a73d13ff2
FIRE-22709: Voice not working on OpenSim. Added fix for OS X.
2018-07-08 14:54:02 -05:00
5586c0e160
FIRE-22709: Fix for local voice not working in OpenSim on Windows
...
Use re-bundled Vivox voice SDK version 4.6.0017.21209 from previous release when
logging into OpenSim since the updated version 4.9.0002.27586 is apparently
incompatible with OpenSim. Use new version only for Second Life.
2018-06-30 15:41:05 +02:00
3bb10f86ba
Get rid of orphaned slplugin_x86 prebuilt lib entirely
2018-01-27 16:30:16 +01:00
688bf1e547
Synchronize with viewer64 source.
2017-01-11 15:36:33 +01:00
7fffa971ef
Remove WiX installer
2016-10-21 13:53:11 +02:00
60e13343bf
- Update CEF
...
- Remove old preload hack and y flipping debug for CEF.
- Enable 64 bit CEF for Windows x64. The plugins will be built as native 64 bit plugins now (no quicktime).
2016-08-02 14:40:56 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
b00369ced9
Use prebuilt SLPlugin on 64-bit OS X.
2016-01-19 21:33:59 -06:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
38223b1996
Use standard 32 bit plugins, not our custom versions.
2015-05-05 14:15:33 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
2714ecea21
adjust cmake not to attempt loads of packages on the wrong platforms
2014-12-17 13:13:41 -05:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
7c8e183d30
Need this library for a 32-bit build too.
2014-07-02 07:57:11 -05:00
e5cc942986
Library updates to universal binary versions for OS X.
2014-07-01 08:21:45 -05:00
8fd6092917
Initial 64-bit and universal darwin support
...
--HG--
branch : Mac64
2014-05-24 23:13:01 -06:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
b7679961e1
- Add dummy WiX & SLPlugin to autobuild.xml. Those are needed for 64 bit Windows (Precompiled 32 bit SLPlugin, WiX to create installer).
...
- Allow 64 bit build to package.
- Create proper packagge targets for 64 bit Windows.
2013-08-04 20:00:19 +02:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
619e0b9a35
remove some cmake output that is no longer needed
2012-07-03 09:36:38 -04:00
9c66ac87fd
STORM-276 Basic spellchecking framework
2012-01-20 18:06:32 +01:00
f99ccb12df
Update slvoice dependency for Windows
2010-11-17 12:19:00 -08:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
1ef51c8345
VWR-8885 CMAKE build hard depends on artwork files
...
Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly.
Reviewed by Aimee.
2010-06-29 13:04:31 +01:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
757e8e84f8
Including fontconfig in the viewer build. (Omitted before)
...
Fix for DEV-17484: package-grabber omits fontconfig
2008-07-03 21:48:30 +00:00
41877d457a
vivox is cleared for open source distribution
...
removing conditional install
reviewed by cg
2008-06-27 17:28:15 +00:00
d32c8825b6
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
2008-06-26 19:08:51 +00:00
fbf15572d9
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
2008-06-12 20:51:41 +00:00
Ansariel