Commit Graph

73 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Ptolemy 84b746ad8e SL-16606: Add profiler category AVATAR 2022-01-14 11:50:22 -08:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07: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
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
Graham Linden 76128c4357 SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
Brad Payne (Vir Linden) a77344516c SL-10471 - animation validation for constraints 2019-02-05 21:38:00 +00:00
andreykproductengine e24d4c9f4d MAINT-8923 Better allocation failure handling, createGLTexture crashes 2018-07-26 20:06:26 +03:00
Brad Payne (Vir Linden) e647ea2ef4 MAINT-7466 - added more verbose logging of animation issues found by the viewer, including invalid joints. Flag the asset id now. 2017-06-06 19:09:08 +01:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
andreykproductengine 5b61515ca3 MAINT-6694 Gesture floater crash 2016-09-22 12:34:52 +03:00
Brad Payne (Vir Linden) 93bafda56b MAINT-6366 - diagnostics related to animation asset downloads 2016-06-13 09:15:42 -04:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Aura Linden a67a01b2a3 MAINT-6162 limit joint offset distances in old style .anim format 2016-02-23 10:47:21 -08:00
Brad Payne (Vir Linden) f8ee9ffce6 SL-333 work - attachment joints now get a valid mJointNum, more checking on valid joint num values. Also reduced log spam slightly. 2016-02-03 16:52:27 -05:00
Brad Payne (Vir Linden) 7b410df303 SL-124 WIP - cleanup of comments and test code before going to project viewer. 2015-11-25 15:07:26 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) 932412e1db SL-109 WIP - code cleanup 2015-08-12 11:17:23 -04:00
Brad Payne (Vir Linden) e8a196f5ff SL-111 WIP - animation dumping/logging 2015-05-16 08:18:19 -04:00
Brad Payne (Vir Linden) 940adfe4d0 WIP bvh diagnostics 2015-05-08 11:16:51 -04:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
callum_linden f405da4f31 Update to build on Xcode 6.0: interesting typo? no one to ask but pretty sure this is the fix ,-Wlogical-not-parentheses] 2014-10-17 15:23:28 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
simon 5dbb0a31da MAINT-2510 : Time can go backwards for viewer animation, assert fires.
Reviewed by Kelly
2013-03-20 11:37:11 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Graham Madarasz (Graham Linden) e8dfa28697 Rollback Maestro interp changes 2013-03-14 14:12:26 -07:00
Graham Madarasz (Graham) f061b2b90e Optimize interp code to elim hundreds of divides per frame and fix jitter bugs. 2013-03-08 15:31:37 -08:00
Aura Linden a57a393bb9 Crashfix for SEC-906 2011-06-28 17:39:34 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Dave Parks 2fea1d5d33 Integrate SIMD API from oreh/server-trunk-oreh 2010-08-19 12:25:15 -05:00
Tofu Linden 838dbb9b0f EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserialize
Speculative bunch of robustification.
Reviewed by Soft.
2010-08-05 16:26:39 +01:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Aimee Linden efb72e66d0 SNOW-484/DEV-51808 FIXED Recursive animations can crash viewer 2010-07-12 17:54:02 +01:00
Richard Nelson 55ea80076b EXT-6422 Infinite loop in LLMotionController::activateMotionInstance
reviewed by monroe
2010-04-09 14:30:15 -07:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00