diff options
author | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
commit | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch) | |
tree | e8a885c7167046bec9311981a7f690a190248b2a /indra/cmake/00-Common.cmake | |
parent | d3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff) | |
parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) |
merge changes for 4.0.0-release
Diffstat (limited to 'indra/cmake/00-Common.cmake')
-rwxr-xr-x | indra/cmake/00-Common.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 1a3b6c5117..86fc2dfff5 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -166,6 +166,9 @@ if (LINUX) -pthread ) + # force this platform to accept TOS via external browser + add_definitions(-DEXTERNAL_TOS) + add_definitions(-DAPPID=secondlife) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. |