Commit Graph

32 Commits (61a842ee43923b190ce76ce9eeeb787e94d8e708)

Author SHA1 Message Date
Ansariel 69e4e6036d Let's output these messages as status messages... 2021-04-01 21:03:21 +02:00
Nicky f238377c80 Bake git rev. hash into the viewer. 2019-12-29 23:27:02 +01:00
Nicky c1152886f7 Prepare for git:
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
Ansariel 5424499703 Don't use Autobuild build ID - make sure we use the Mercurial revision 2017-07-27 21:11:18 +02:00
Nicky fd0bc6f292 Merge with viewer64. 2017-02-26 20:04:26 +01:00
Oz Linden f0b256b1cb correct merge error in BuildVersion.cmake 2017-02-22 17:34:46 -05:00
Oz Linden f77af9df43 use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild 1.1.4) 2017-02-22 17:03:00 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed 1fe8d04a46 DRTVWR-418, MAINT-7038: Don't add double quotes to channel name.
The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as
LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At
this point in history, those double quotes literally become part of the
LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version
Manager query containing those double quotes. Removing them fixes the query.
2017-01-05 18:49:56 -05:00
Oz Linden 97f11bc635 move build number informative output to stdout 2016-06-09 10:03:07 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 4fd57774dd OPEN-297 simplify build number generation 2016-02-07 14:58:47 -08:00
Oz Linden b46627ffc4 add build configuration to the About box if it is not Release
remove some superfluous other information from About
2016-02-04 23:32:42 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Cinder ee0573dff5 Simplify, and fix build failure when mercurial isn't installed
--HG--
branch : Mac64
2014-05-24 23:14:55 -06:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Oz Linden 035ab9f374 open-183: improve local build number generation to account for multiple heads 2013-09-05 11:41:19 -04:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Nyx Linden 5ae117aff6 merge with viewer-release 2013-08-16 19:31:16 -04:00
Oz Linden a4966a6612 OPEN-182: correct tip rev number use in local build version generation 2013-07-16 17:38:26 -04:00
Nyx Linden 69b062b908 merge with viewer-release 2013-06-18 16:15:03 -04:00
Oz Linden a3a933e212 fix local build numbers when compiling a merge before committing (two parents) 2013-06-04 12:33:51 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Oz Linden 70b0b2a2e3 revise test for hg to detect and ignore incorrect results from cygwin hg 2013-05-21 15:44:08 -04:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master 6007d1235e merge snowstorm repo 2013-10-19 23:48:44 -07:00
Tonya Souther 70ab9da383 FIRE-11737: Use current repository revision instead of tip revision for build number. 2013-09-24 22:09:12 -05:00
Oz Linden b0125b513c add viewer channel to compile time feedback 2013-02-20 15:53:17 -05:00
Oz Linden d7e90f4160 derive version number from indra/VIEWER_VERSION.txt 2013-02-07 11:56:57 -05:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00