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

429 Commits (076a89506243e8d4037f34c2a78278ff6ee0f1f7)

Author SHA1 Message Date
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Ptolemy f571de9de4 SL-16606: Add profiler category NETWORK 2022-01-14 11:50:20 -08:00
Ptolemy 41894327c3 SL-16606: Add profiler category AVATAR 2022-01-14 11:50:19 -08:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Runitai Linden e7227afe02 SL-16166 Apply optimizations from pushBatch to other render call sites. Optimize out a map lookup in rigged face rendering. 2021-10-14 13:02:40 -05:00
Runitai Linden f844b4e6b9 SL-15961 Convert LLMeshRepository::mSkinMap into unordered_map and reduce number of per-frame lookups to said map. 2021-09-14 20:18:58 -05:00
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Andrey Kleshchev 823f97ac59 SL-15272 Bugsplat crashes at condition wait() 
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
 2021-06-03 21:31:30 +03:00
Callum Prentice 0df59ff9e6 Fix for SL-15105 (Mesh/Cache messages are spamming the log) - I don't know why the log spam is present when the 'Mesh' tag is missing from logcontrol.xml for LL_INFOS(..) messages so I changed it to LL_DEBUGS(..) 2021-04-12 15:03:26 -07:00
Callum Prentice 9f95e619c9 Add some logging for QA purposes (based on INFO/Mesh tag) to display when the mesh header and the mesh body is retrieved from the simulator or the local cache. 2021-03-26 11:47:41 -07:00
Callum Prentice d7518c7b4f Ansariel kindly offered their patch to help mitigate this round of file system issues - taken from https://vcs.firestormviewer.org/phoenix-firestorm/changeset/104a8600946be01e2de44d10ad069ba854272d1f 2021-03-09 18:33:35 -08: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 9b1d9150c2 Merge branch 'master' into DRTVWR-519 2020-11-11 13:22:35 -08:00
Mnikolenko Productengine c66c426d6b SL-14148 remove redundant zeroing of the file 2020-10-26 20:01:12 +02:00
Callum Prentice 3092aa8aae Add in the C++ filesystem based cache and clean up some indempotent functions in llfilesystem 2020-10-06 17:16:53 -07: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
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
 2020-09-22 23:30:12 +03:00
Callum Prentice 38faec3b11 Merge branch 'master' into DRTVWR-519 2020-09-22 13:07: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
Andrey Lihatskiy a9885029cf Merge branch 'master' into DRTVWR-507-maint 2020-08-18 19:11:34 +03:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
 2020-08-11 01:34:13 +03:00
Andrey Kleshchev 370a82b763 SL-13634 Don't warn about convex decomposition issues if it's a stub 2020-07-28 21:55:48 +03:00
Andrey Kleshchev a3e5fe369f Fixed assert on volume unref 2020-05-27 12:37:31 +00:00
Andrey Lihatskiy 30234c508b Merge branch 'master' into DRTVWR-507-maint 2020-05-05 01:40:40 +03:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Andrey Lihatskiy 94dc8f12f8 Merge branch 'master' into DRTVWR-507-maint 2020-04-27 15:16:21 +03:00
Andrey Kleshchev 16641fc33d SL-2569 LLSD header of a mesh should be covered by mutex 2020-04-07 23:08:01 +03:00
Andrey Lihatskiy a520c01c73 Merge branch 'master' into DRTVWR-501-maint 2020-03-28 01:00:34 +02:00
Andrey Lihatskiy 6662f7348b Merge branch 'master' into DRTVWR-500 2020-03-18 20:52:51 +02:00
Brad Payne (Vir Linden) c9305c1e49 merge 2020-02-21 15:36:59 +00:00
Andrey Kleshchev c8e89de61d SL-2569 More bad alloc checks 2020-02-03 17:29:08 +00:00
Brad Payne (Vir Linden) 65550520ed SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
andreykproductengine 1b4d5492c6 SL-11727 Fix build warnings 2019-10-23 16:37:15 +03:00
andreykproductengine 48e282947f SL-11986 Mesh Uploader does not report Upload cost on fee-failure 2019-10-15 17:25:26 +03:00
andreykproductengine ff2a6f97a2 SL-1105 Pack a name for server to use 2019-05-28 20:38:37 +03:00
andreykproductengine 2fc7a511db SL-10422 Validate mesh 2019-03-03 11:43:10 +02:00
andreykproductengine ba8f261fdf SL-10422 Validate loaded mesh 2019-02-22 21:02:51 +02:00
andreykproductengine fa15830e02 SL-10291 Replace apr_atomic with standard C++11 functionality 2019-01-15 18:31:17 +02:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
andreykproductengine d9fdb948d9 SL-9747 [Mesh Uploader] Remove confusing model_metric from upload 2018-11-29 21:04:35 +02:00
andreykproductengine e1c7688b2c SL-10101 Remade most frequent setting calls to cached variants 2018-11-26 18:50:40 +02:00
Brad Payne (Vir Linden) 9d7b353cbb merge 2018-06-21 15:49:53 +01:00
Brad Payne (Vir Linden) 2a2046fd07 merge 2018-06-05 22:44:04 +01:00
andreykproductengine 9437d1511e merge from viewer-release 2018-06-01 01:18:47 +03:00
AndreyL ProductEngine 64b3473f49 Merged in lindenlab/viewer-release 2018-05-18 03:02:44 +03:00
Andrey Kleshchev 0abe3a4919 MAINT-8593 Viewer should not repeat mesh dowloads indefinetely 2018-05-04 15:46:05 +00:00
Andrey Kleshchev 7b5c0dd39a MAINT-8593 Viewer should not repeat loads indefinetely 2018-05-03 18:44:10 +00:00