1167ea994c
SL-17634 Replace deprecated carbon Gestalt calls
2022-06-22 18:00:49 +03:00
8ac67e5476
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
2022-06-18 15:53:35 +02:00
33fe18c335
SL-17485-b - Attempt to make teamcity builds happy by not referencing a newview global from an llcommon file.
2022-06-17 16:29:39 -07:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
34064a7c28
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-19 21:22:11 +02:00
ed74d15246
SL-17388 Add SSE version info to ViewerStats
2022-05-18 01:27:25 +03:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
1aaa765d26
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 12:33:48 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
e10dea5fe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 18:09:12 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
78f9a28191
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2022-01-13 21:12:09 +01:00
21daf8d41b
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-12 22:24:37 +01:00
093395b489
SL-15997 Windows 11 detection #2
2022-01-12 21:31:24 +02:00
a3d14e89a3
SL-15997 Windows 11 detection
2022-01-12 21:30:43 +02:00
81f2d2dc47
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:13:54 +01:00
bf6a334ff4
Add Windows 11 detection (which Kokua can yoink again...)
2022-01-05 15:30:16 +01:00
9a1af101cd
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
f00647b6fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 15:38:25 +01:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
35398057a4
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-22 23:24:38 +02:00
1b5d151c15
SL-15997 Windows 11 detection
2021-10-21 03:44:40 +03:00
4be6981c6d
SL-15964 Fix gzip failing to compress files into unicode paths
2021-10-19 00:41:19 +03:00
675514bdb3
SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging.
2021-09-27 23:56:06 +00:00
59906ecd60
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-09-20 11:59:11 +02:00
ab3261f901
SL-15997 Windows 11 version detection
2021-09-14 18:31:14 +03:00
5af8f15a05
SL-14541 Replace zlib with zlib-ng
2021-09-08 23:18:07 +03:00
c82995f3e6
SL-15832 Add OS bitness to ViewerStats
2021-09-07 18:46:40 +03:00
f8d1834036
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-09 08:48:27 +02:00
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
7f91fa0b40
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:15:10 +02:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
888dce7482
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llsys.cpp
2021-03-03 21:12:21 +01:00
54c2608d45
SL-12122 - removed frametime spikes in windows build caused by unnecessary call to GetPerformanceInfo()
2021-03-02 22:27:45 +02:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
03921adb12
SL-2202 Add exception handling around boost::regex_match() calls in the viewer
2021-01-11 17:07:03 +02:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
d1c373d9bc
Ugly hack to prevent even uglier overflow and negative amounts of memory...
2020-10-25 01:11:34 +02:00
bf822b85de
Use IsWindows10OrGreater since target SDK is now Windows 10 and remove the year from Windows Server since the different versions can only be distinguished by the build numbers
2020-10-15 21:14:36 +02:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
90ff9e8fb1
Merge viewer-neko
2018-11-14 19:28:16 +01:00
2d22230950
SL-9935 Include full win10 build number in Help > About Second Life and logs
2018-11-12 15:31:19 +02:00
985730a52c
Merge.
2017-05-18 17:40:24 +02:00
9fa131b088
DRTVWR-418, MAINT-6996: Update Mac mem queries (per Drake Arconis)
...
Drake points out that the OS X 64-bit-capable memory-query APIs recommended in
comments by some long-ago maintainer are by now themselves obsolete. He
offered this patch to update us to current macOS memory APIs.
2017-05-10 14:19:44 -04:00
52899ed62a
DRTVWR-418, MAINT-6996: Rationalize LLMemory wrt 64-bit support.
...
There were two distinct LLMemory methods getCurrentRSS() and
getWorkingSetSize(). It was pointless to have both: on Windows they were
completely redundant; on other platforms getWorkingSetSize() always returned
0. (Amusingly, though the Windows implementations both made exactly the same
GetProcessMemoryInfo() call and used exactly the same logic, the code was
different in the two -- as though the second was implemented without awareness
of the first, even though they were adjacent in the source file.)
One of the actual MAINT-6996 problems was due to the fact that
getWorkingSetSize() returned U32, where getCurrentRSS() returns U64. In other
words, getWorkingSetSize() was both useless *and* wrong. Remove it, and change
its one call to getCurrentRSS() instead.
The other culprit was that in several places, the 64-bit WorkingSetSize
returned by the Windows GetProcessMemoryInfo() call (and by getCurrentRSS())
was explicitly cast to a 32-bit data type. That works only when explicitly or
implicitly (using LLUnits type conversion) scaling the value to kilobytes or
megabytes. When the size in bytes is desired, use 64-bit types instead.
In addition to the symptoms, LLMemory was overdue for a bit of cleanup.
There was a 16K block of memory called reserveMem, the comment on which read:
"reserve 16K for out of memory error handling." Yet *nothing* was ever done
with that block! If it were going to be useful, one would think someone would
at some point explicitly free the block. In fact there was a method
freeReserve(), apparently for just that purpose -- which was never called. As
things stood, reserveMem served only to *prevent* the viewer from ever using
that chunk of memory. Remove reserveMem and the unused freeReserve().
The only function of initClass() and cleanupClass() was to allocate and free
reserveMem. Remove initClass(), cleanupClass() and the LLCommon calls to them.
In a similar vein, there was an LLMemoryInfo::getPhysicalMemoryClamped()
method that returned U32Bytes. Its job was simply to return a size in bytes
that could fit into a U32 data type, returning U32_MAX if the 64-bit value
exceeded 4GB. Eliminate that; change all its calls to getPhysicalMemoryKB()
(which getPhysicalMemoryClamped() used internally anyway). We no longer care
about any platform that cannot handle 64-bit data types.
2017-05-02 10:51:18 -04:00
77bd2672cb
Add detection of Windows Server 2016
2016-05-02 14:12:39 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
e4a639bc48
Widnows: Proper path handling for utf8 paths
2016-01-30 23:41:14 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
d693d7247c
Remove obsolete files.
2015-08-19 21:21:06 +02:00
cf68cc2d12
Whitespace fixes. No code changes.
2015-08-16 09:07:35 -05:00
43288cc300
FIRE-10950: Handle VM szes greater than 2 TB.
2015-08-15 19:12:51 -05:00
c10c77f2d7
STORM-2105: Remove now obsolete code
2015-05-21 11:21:33 +02:00
f2d033ef59
STORM-2105: Switch to VersionHelper API to determine Windows version
...
While we could set major and minor operating system version with the data
returned by GetVersionEx / GetVersion, we set them explicitly as named function
may be altered or removed in the future. In that case, only the build number
would be affected.
Also removed the old way of determing the build number via shell version. This
was only needed for Windows 9x, which aren't supported anymore and can't even
run the viewer.
2015-05-21 11:13:01 +02:00
c806c5784a
Sync Windows version detection with V3 as I'm going to pull STORM-2105
2015-06-04 11:45:44 +02:00
8436c9e72e
FIRE-15573: Switch to VersionHelper API to determine Windows version
2015-05-11 11:42:48 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
111900150d
work arounds to compile on linux
2014-12-22 16:42:55 -05:00
5e83473542
Improve performance of LLMemoryInfo::loadStatsMap. When querying for process memory only, there is no need to make a potential expensive call into GetPerformanceInfo.
2015-02-26 11:24:56 +01:00
40e56de0b8
Fix FIRE-15464: The latest nightly build is detecting Windows 8.1 as Windows 10
2015-01-29 21:23:02 -08:00
04b78ef193
Update Windows 10 detection do to kernal version change in latest tech preview (6.4 -> 10.0)
2015-01-27 23:56:15 -08:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
8db1250b73
Update to build on Xcode 6.0: collection of similar const var not used warnings/errors [-Wunused-const-variable]
2014-10-17 14:08:58 -07:00
8a1c199e07
Display Windows 10 in help->about properly
2014-10-01 22:01:41 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
f7dc3937cd
SH-4641 FIX Interesting: Incorrect amount of system memory detected on Mac
2013-12-03 20:27:41 -08:00
34ff2fc46b
merge with release
2013-12-02 14:57:29 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08:00
970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
420a1af0c8
SH-4774 FIX: textures are blurry on Mac
2013-09-11 16:26:03 -07:00
ddd9d1396c
merge
2013-09-09 20:19:36 -07:00
21ab67416d
SH-4774 FIX: textures are blurry on Mac
2013-09-09 20:18:12 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e2019e8a3b
Merge downstream code with viewer-release
2013-09-09 16:17:16 -07:00
f515c132e4
MAINT-2850 Fix for linux build
2013-08-22 11:38:42 +03:00
37626bb4a2
BUILDFIX: gcc build fixes
2013-08-21 14:45:04 -07:00
ce6d63be47
Fix file EOL format
2013-08-21 20:41:30 +00:00
87add5bfb6
MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility mode always
2013-08-20 20:49:36 +03:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
25937040de
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
converted many values over to units system in effort to track down
source of 0 ping
2013-08-16 12:38:12 -07:00
Maxim Nikolenko