livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,906 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

245 Commits (acf82867b61535b7b39b89f71a282e3ce3d0673e)

Author SHA1 Message Date
Andrey Kleshchev acf82867b6 Merge branch 'main' (DRTVWR-580) into DRTVWR-567 
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
 2023-07-17 23:34:59 +03:00
Andrey Lihatskiy ade8c96e5c Merge branch 'main' into DRTVWR-567 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2023-05-02 17:57:11 +03:00
Andrey Lihatskiy 504ef7e9e3 Merge branch 'main' into DRTVWR-580-maint-T 2023-05-02 17:39:29 +03:00
Maxim Nikolenko 198cd4df09 Merge branch 'main' into DRTVWR-567 
# Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
 2023-03-30 14:09:50 +03:00
Andrey Lihatskiy 7b2205d8f6 Merge branch 'main' into DRTVWR-580-maint-T 2023-03-30 00:39:12 +03:00
Andrey Kleshchev d2a8a3bd53 SL-18964 Smoke texture can fail to load 
Debt from SL-18221.
Keep init together, after we got the cap; texture should finish loading before it's needed.
 2023-03-16 01:18:07 +02:00
Andrey Kleshchev dd656390c3 SL-19108 Only permit 64 to 256 px images for thumbnails 2023-02-25 23:08:38 +02:00
Mnikolenko Productengine 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
Callum Prentice f7838ca17c Merge branch 'main' into DRTVWR-568 2022-12-12 11:13:10 -08:00
Mnikolenko Productengine de0317cc3f Merge branch 'DRTVWR-568' into DRTVWR-539 2022-11-22 23:12:05 +02:00
Andrey Kleshchev 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
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07:00
Mnikolenko Productengine 717b34f53f Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
 2022-10-21 14:42:53 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Andrey Kleshchev 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
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Callum Linden 2aace1793b Merge branch 'master' into DRTVWR-568 2022-08-30 15:23:37 -07:00
Andrey Lihatskiy 55da4ea8bb Merge branch 'master' into DRTVWR-565-maint-P 
# Conflicts:
#	indra/newview/llfloateroutfitsnapshot.cpp
 2022-08-31 00:36:22 +03:00
Andrey Lihatskiy a9a63db0f0 Merge branch 'master' into DRTVWR-548-maint-N 2022-08-31 00:17:37 +03:00
Nat Goodspeed 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
Mnikolenko Productengine 5f8f4754ab SL-17723 Remove use of UDP image fetch 2022-07-13 17:22:01 +03:00
Mnikolenko Productengine b0e9840648 Merge branch 'master' into DRTVWR-539 2022-06-29 21:03:15 +03:00
Andrey Lihatskiy 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
Andrey Kleshchev 1b369c7f10 Merge branch 'master' (DRTVWR-543) into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-06-29 18:30:05 +03:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Andrey Lihatskiy 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
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03:00
Mnikolenko Productengine 79c9a8a4b7 Merge branch 'DRTVWR-546' into DRTVWR-539 2022-04-26 16:03:03 +03:00
Andrey Kleshchev 285e36b57e SL-15312 Legacy profiles remake #3 2022-04-09 00:57:19 +03:00
Andrey Kleshchev f57240caf7 SL-17096 Login screen fields are gray 2022-03-30 19:07:29 +03:00
Andrey Kleshchev 43fcf86b3b SL-16937 New Profile capability, image uploader cap #6 2022-03-28 21:45:31 +03:00
Andrey Kleshchev 3b6a4facae SL-17041 Texture loading was slower at login on Performance viewer 2022-03-23 16:37:31 +02:00
Mnikolenko Productengine 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
Andrey Kleshchev 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
Nicky 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
Ptolemy bf0643e28a SL-16606: Add profiler category TEXTURE 2022-01-14 11:50:21 -08:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Dave Parks 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
Dave Parks 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
Dave Parks d00272e0cc SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default. 2021-10-11 16:03:40 +00:00
Dave Parks f79890669d SL-16006 and SL-16009 Rigged mesh rendering optimization pass 2021-09-20 18:58:09 +00:00
Mnikolenko Productengine c8977fd904 SL-15177 Fix the way of counting for gTextureTimer 2021-04-29 17:38:15 +03:00
Callum Prentice 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
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 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
Callum Prentice 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
andreykproductengine 94d4364084 SL-12103 More reliable memory detection 2019-10-16 22:36:10 +03:00
andreykproductengine a6595dfa9b SL-10344 Fix boost priority 2019-04-16 19:50:29 +03:00