summaryrefslogtreecommitdiff
path: root/indra/llappearance
AgeCommit message (Collapse)Author
2023-02-07SL-19134 Some texture related adjustmentsAndrey Kleshchev
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-19Fix leak of mRoot during LLAvatarAppearance destructionRye Mutt
2022-10-19Fix leak of tex layer objects during LLLocalTextureObject destructionRye Mutt
2022-07-27SL-17828 Crash at LLPolyMorphData::loadBinaryAndrey Kleshchev
These files are usually prepackaged with viewer, either all issues should lead to an error or all issues should use warns. I don't think it is a critical issue, so instead of crashing, printing out filename.
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# 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-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-18SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of ↵Brad Payne (Vir Linden)
animations containing invalid joint names # Conflicts: # indra/newview/llviewerassetupload.cpp # indra/newview/llvoavatar.cpp
2022-04-14void LLTexLayerSet::asLLSD was never used, remove it completely.Nicky
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14Semicolon at end of for loop was making sure nothing ever got done.Nicky
The whole methode is questionable in doing nothing and it seems there was a deliberate change that made sure it does nothing. I am not sure what this method really is supposed to do, thus I did opt for the most basic version of "do nothing" like it was before. (cherry picked from commit 1c1a93e42e209e959f09ec46ca414a8936f4ac20)
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-30SL-16386 purge no-op fxn LLTexUnit::setTextureBlendType()Dave Houlton
2021-11-30SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunctionDave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
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-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' v6.4.14 into DV525-merge-6.4.14Dave Houlton
2021-02-17Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519unknown
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2021-01-04SL-14529 Replace dynamic_cast to LLAvatarJoint with static castsAndrey Kleshchev
Replaced couple (LLAvatarJoint*) for consistency
2020-11-30SL-14369 Get rid of static sSkeletonXMLTreeMnikolenko ProductEngine
2020-11-30SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()Mnikolenko ProductEngine
2020-11-13SL-14303 Wearable type label should contain translated intead of default stringAndrey Kleshchev
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel.
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-10-20SL-14142 - impostor management cleanupBrad Payne (Vir Linden)
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
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-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
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-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-03-26DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge.Nat Goodspeed
2020-03-25DRTVWR-476: Eliminate LLWearableType LLSingleton circularity.Nat Goodspeed
LLWearableType::initSingleton() calls LLWearableDictionary::initParamSingleton(). LLWearableDictionary's constructor constructs specific WearableEntry instances, each of which wants to translate its name string to a user-facing label using LLWearableType::mTrans. WearableEntry's constructor was calling LLWearableType::getInstance(). Under circumstances we don't fully understand (recursive mutex misbehavior?), that could hang. Instead, pass the canonical LLWearableType instance to LLWearableDictionary's constructor, and from there into WearableEntry's constructor.
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-13SL-12272 Ordered Shutdown log spamandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 12:54:50 +0000