Commit Graph

167 Commits (2bc4fb2bf0bef5adf709ef1fc90ba1bcdee7f8d0)

Author SHA1 Message Date
Ansariel 2bc4fb2bf0 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llview.h
#	indra/newview/llaisapi.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterproperties.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelmarketplaceinbox.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/llsidepanelinventory.h
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
#	indra/newview/skins/default/xui/en/sidepanel_task_info.xml
#	indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
Ansariel 026b8ff411 Update URL of message template 2022-11-21 20:40:50 +01:00
Nat Goodspeed a2a723f383 DRTVWR-575: Suppress remaining size_t truncation warnings for now. 2022-11-03 15:19:49 -04:00
Nat Goodspeed 206993f843 DRTVWR-575: Forbid Xcode 14.1 from implicitly signing every target.
Or rather, attempting to implicitly sign. On TeamCity we must explicitly sign
using viewer_manifest.py. On a developer system, without these changes, Xcode
produces many errors of the form:
error: An empty identity is not valid when signing a binary for the product
type 'Command-line Tool'. (in target 'INTEGRATION_TEST_lldir' from project
'SecondLife')
and refuses to compile anything at all.

Thanks to Rye Mutt and NickyD. Also thanks Geir Nøklebye for additional
settings to help tame Xcode 14.1 warnings.
2022-11-03 13:46:19 -04:00
Nicky 3fcfa778ae Handle variables for OSX signing a bit more graceful and do't force them
right into the cache.
See https://alexreinking.com/blog/how-to-use-cmake-without-the-agonizing-pain-part-2.html
2022-06-30 15:09:14 +02:00
Ansariel 9718a38e9a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 03:07:48 +02:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
Ansariel 9e415cdbb2 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-05-25 11:03:48 +02:00
Ansariel 6305dc1ed8 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-17 13:33:56 +01:00
Mnikolenko Productengine 7cd921d97b SL-13313 Update links to master message_template.msg 2021-01-15 14:33:23 +02:00
Ansariel 6daf35217e Update message template master URL 2020-05-21 00:35:09 +02:00
Ansariel 0edd174dec Turn HAVOK_TPV off and switch to HACD in case somebody tries a Havok build on Linux 2020-04-30 12:30:50 +02:00
Ansariel 146d527104 Merge viewer-neko 2019-10-09 22:05:52 +02:00
Nat Goodspeed c0b13466f1 DRTVWR-476: Add Stack Overflow link for Brad's Xcode 11 signing fix. 2019-09-25 16:46:49 -04:00
Brad Kittenbrink 5d671ff210 Disabled broken automatic code signing for local development when using Xcode 11 2019-09-25 12:53:38 -07:00
Liny d428d17aaa After feedback from discord, add the client key into Variables.cmake.
Note to any other third party client, please obtain your own key for your client so you can customize the rich presence features.
2019-09-25 01:01:25 -07:00
Oz Linden e409c0492f convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach 2019-03-02 11:58:11 -05:00
Nat Goodspeed 3f7c75b8a0 SL-957: Explicitly pass VIEWER_SYMBOL_FILE from build.sh into CMake
instead of relying on both indra/newview/CMakeLists.txt and build.sh
generating the same file pathname.

Make build.sh set VIEWER_SYMBOL_FILE (instead of symbolfile) in pre_build, and
pass it to autobuild configure via -D switch. Then the uploads stanza can just
use VIEWER_SYMBOL_FILE instead of performing its platform-sensitive case
statement right there.

Introduce VIEWER_SYMBOL_FILE CMake cache variable, default empty string.

Make indra/newview/CMakeLists.txt generate_breakpad_symbols logic conditional
on VIEWER_SYMBOL_FILE being non-empty, as well as everything else. Eliminate
local set(VIEWER_SYMBOL_FILE) directives.
2018-08-27 13:55:50 -04:00
Nat Goodspeed c2178bb6ac DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.
Define the CMake cache variable, with empty string as its default.

Make build.sh pass the BUGSPLAT_DB environment variable as a CMake
command-line variable assignment.

Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'.

Make CMake pass new --bugsplat switch to every one of SIX different
invocations of viewer_manifest.py.

Give llmanifest.main() function an argument to allow supplementing the base
set of command-line switches with additional application-specific switches.

In viewer_manifest.py, define new --bugsplat command-line switch and pass to
llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult
self.args['bugsplat'].
2018-08-24 09:56:56 -04:00
Ansariel 603b840a0f Correctly handle the case when building without OpenSim and without Havok support 2019-05-11 14:22:24 +02:00
Ansariel 6bd724e65a Merge viewer-bugsplat 2018-08-31 09:17:34 +02:00
Ansariel 64bba0f9aa We don't use Teamcity -> allow unattended again 2018-07-27 11:26:22 +02:00
Ansariel 0f121d042d Merge viewer-bugsplat 2018-07-27 11:19:42 +02:00
Oz Linden d2fa5a53e8 remove unused UNATTENDED cmake variable that generates warnings 2018-05-30 13:14:43 -04:00
Ansariel d6fc87d425 Backed out changeset: 3ea0be55560b 2018-02-18 18:04:13 +01:00
Ansariel 547df251e4 Merge viewer64 2017-10-02 17:57:56 +02:00
Nat Goodspeed eae144219c DRTVWR-418: Another attempt to generate Mac debug symbols.
The viewer's 00-COMPILE-LINK-RUN.txt recommends passing -gdwarf-2 to the Mac
compiler, and so we've been doing ever since before the viewer-build-variables
repo was engaged. Now we discover that when CMake sees -gdwarf-2, it removes
the -g switch entirely. It also removes it when you pass plain -g. Only when
you pass -gdwarf-with-dsym or just -gdwarf does CMake pass plain -g to the
compiler. Change -gdwarf-2, if specified, to -gdwarf so we at least get -g.
2017-09-19 15:35:08 -04:00
Ansariel c15640e51c Fix CMake warning CMP0054 in Variables.cmake 2017-07-29 01:04:10 +02:00
Nicky 688bf1e547 Synchronize with viewer64 source. 2017-01-11 15:36:33 +01:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed eff6bbea59 DRTVWR-418: Emit less confusing error message when LL_BUILD not set.
When LL_BUILD is not in the environment at autobuild configure time, important
macros such as LL_WINDOWS aren't set. That means that platform-dependent
macros such as LL_TYPEOF() aren't defined, which can produce obscure errors
like this:

indra\llcommon\llunittype.h(51): error C2226: syntax error :
unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp)
10>          indra\llcommon\llunittype.h(52) :
see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled

Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22 16:12:21 -05:00
Nat Goodspeed 3b34cfd93a DRTVWR-418: Derive certain CMAKE_XCODE_etc. vars from LL_BUILD. 2016-12-14 09:12:33 -05:00
Nat Goodspeed 45a32ed14d DRTVWR-418: Align minimum OS X version with viewer-build-variables. 2016-12-12 11:50:25 -05:00
Nat Goodspeed 8b61d4f277 DRTVWR-418: Change to libc++ on Mac, remove reminder warning. 2016-11-19 08:51:29 -05:00
Nat Goodspeed c5770cd1af DRTVWR-418: Add warning about changing to libc++ on Mac. 2016-11-17 08:57:11 -05:00
Nat Goodspeed bc7d8d3a94 DRTVWR-418: Try to make the OSX architecture match computed ARCH
which in turn depends on ADDRESS_SIZE.
2016-11-16 16:06:32 -05:00
Nat Goodspeed 8c061ab184 DRTVWR-418: Compute ADDRESS_SIZE from arch if not specified.
Migrate the logic formerly used only for LINUX to detect whether ADDRESS_SIZE
is set to 32 or 64, and if not, detect a default for the platform. But instead
of using uname -m, use python's platform.machine().

On Windows, stop forcing ARCH to i686 and ADDRESS_SIZE to 32.

On Mac, reset default to x86_64 instead of i386; stop forcing ADDRESS_SIZE to
32.
2016-11-16 15:27:36 -05:00
Nat Goodspeed 6c7a972861 DRTVWR-418: Fold windows64 into windows platform with new autobuild.
autobuild 1.1 now supports expanding $variables within a config file --
support that was explicitly added to address this very problem. So now the
windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE,
$AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle
most of the deltas between the windows platform and windows64.

This permits removing the windows64 platform definition from autobuild.xml.

The one remaining delta between the windows64 and windows platform definitions
was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking
ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE
instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing
LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-15 15:53:24 -05:00
Tonya Souther c277e3c772 Fix cmake warning. 2016-10-03 08:36:16 -05:00
Tonya Souther a2ae9255f0 Add support for OS X 10.12 SDK. 2016-09-28 00:28:41 -05:00
Nicky 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
Tonya Souther ebf13f9abc Build fixes for C++11 on OS X. Includes several rebuilt libraries. 2016-06-21 15:57:18 -05:00
Tonya Souther 5d35959602 Handle building on OS X with Xcode 6 or 7 and SDKs from 10.9 through 10.11. 2016-06-20 11:15:27 -05:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Tonya Souther b7d4686cb0 Automate not building media plugins on 64-bit OS X. 2016-01-20 16:16:50 -06:00
Nicky 6988580777 OpenJPEG 1.4 is default for now. 2016-01-17 13:13:05 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Nicky f8cd0ee42c Back to building with XCode 6.0 and macosx10.9 sdk. 2016-01-02 18:46:02 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 2cdc06af0c Merge. 2015-10-05 17:09:58 +02:00