3906e78178
Allow defining a separate upstream viewer version for About window
...
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
2026-01-28 19:56:46 +01:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
7522cea252
Use git for version detection fallback
2022-04-06 16:31:53 +02:00
2dc899a698
Replace hg with git, as mercurial isn't used for ages anymore
2022-03-01 09:33:23 +01:00
69e4e6036d
Let's output these messages as status messages...
2021-04-01 21:03:21 +02:00
f238377c80
Bake git rev. hash into the viewer.
2019-12-29 23:27:02 +01:00
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
5424499703
Don't use Autobuild build ID - make sure we use the Mercurial revision
2017-07-27 21:11:18 +02:00
fd0bc6f292
Merge with viewer64.
2017-02-26 20:04:26 +01:00
f0b256b1cb
correct merge error in BuildVersion.cmake
2017-02-22 17:34:46 -05:00
f77af9df43
use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild 1.1.4)
2017-02-22 17:03:00 -05:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
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
97f11bc635
move build number informative output to stdout
2016-06-09 10:03:07 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
4fd57774dd
OPEN-297 simplify build number generation
2016-02-07 14:58:47 -08:00
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
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
ee0573dff5
Simplify, and fix build failure when mercurial isn't installed
...
--HG--
branch : Mac64
2014-05-24 23:14:55 -06:00
7866356d77
Merge viewer-release => sunshine-internal
2013-10-29 13:20:18 +00:00
035ab9f374
open-183: improve local build number generation to account for multiple heads
2013-09-05 11:41:19 -04:00
144eb1912d
merge
2013-09-04 13:41:51 -04:00
5ae117aff6
merge with viewer-release
2013-08-16 19:31:16 -04:00
a4966a6612
OPEN-182: correct tip rev number use in local build version generation
2013-07-16 17:38:26 -04:00
69b062b908
merge with viewer-release
2013-06-18 16:15:03 -04:00
a3a933e212
fix local build numbers when compiling a merge before committing (two parents)
2013-06-04 12:33:51 -04:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
70b0b2a2e3
revise test for hg to detect and ignore incorrect results from cygwin hg
2013-05-21 15:44:08 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
70ab9da383
FIRE-11737: Use current repository revision instead of tip revision for build number.
2013-09-24 22:09:12 -05:00
b0125b513c
add viewer channel to compile time feedback
2013-02-20 15:53:17 -05:00
d7e90f4160
derive version number from indra/VIEWER_VERSION.txt
2013-02-07 11:56:57 -05:00
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
PanteraPolnocy