553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
de0317cc3f
Merge branch 'DRTVWR-568' into DRTVWR-539
2022-11-22 23:12:05 +02:00
6a6b10020e
SL-18565 Built-in bump maps and some environment textures fail to load
...
Due to udp texture fetching no longer being present
2022-11-03 23:51:05 +02:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
687ba77897
SL-18221 Water texture does not load after clearing cache
...
Water texture should load only after having caps.
Prefetch textures should load only after having caps.
Prefetch list is now per grid
2022-09-23 01:20:41 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
2aace1793b
Merge branch 'master' into DRTVWR-568
2022-08-30 15:23:37 -07:00
55da4ea8bb
Merge branch 'master' into DRTVWR-565-maint-P
...
# Conflicts:
# indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31 00:36:22 +03:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
65612700f3
DRTVWR-558: Eliminate many spurious set-not-used variables.
...
With Xcode 13.4, these unused variables break Release builds.
2022-08-24 14:00:16 -04:00
5f8f4754ab
SL-17723 Remove use of UDP image fetch
2022-07-13 17:22:01 +03:00
b0e9840648
Merge branch 'master' into DRTVWR-539
2022-06-29 21:03:15 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03: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
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
79c9a8a4b7
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-04-26 16:03:03 +03:00
285e36b57e
SL-15312 Legacy profiles remake #3
2022-04-09 00:57:19 +03:00
f57240caf7
SL-17096 Login screen fields are gray
2022-03-30 19:07:29 +03:00
43fcf86b3b
SL-16937 New Profile capability, image uploader cap #6
2022-03-28 21:45:31 +03:00
3b6a4facae
SL-17041 Texture loading was slower at login on Performance viewer
2022-03-23 16:37:31 +02:00
0aaf5284dc
Merge branch 'master' into DRTVWR-539
...
# 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-02 00:46:10 +02: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
6906582401
Calling a method on a pointer that is 100% certain to be inalid is a
...
really bad idea ...
2022-02-28 22:23:05 +01:00
bf0643e28a
SL-16606: Add profiler category TEXTURE
2022-01-14 11:50:21 -08:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00: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
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
c8977fd904
SL-15177 Fix the way of counting for gTextureTimer
2021-04-29 17:38:15 +03:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
94d4364084
SL-12103 More reliable memory detection
2019-10-16 22:36:10 +03:00
a6595dfa9b
SL-10344 Fix boost priority
2019-04-16 19:50:29 +03:00
4156fb832c
MAINT-6363 Normal and specular maps should not be downloaded if ALM is off
2018-03-06 12:59:32 +00:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
062be76dd5
MAINT-4354 Render stalls in object heavy regions
2017-12-15 12:43:54 +00: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
602c9bc04a
MAINT-6317 Restored the fix after a conflict resolution
2016-05-20 02:12:26 +03:00
c50f96b492
Merged in lindenlab/viewer-lynx
2016-05-20 02:06:08 +03:00
d3de134da0
MAINT-6409 invisiprims should be preloaded
2016-05-18 17:17:32 +03:00
e795fee864
MAINT-6409 texture_list xml file should be in cache.
2016-05-17 17:05:59 +03:00
Mnikolenko Productengine