summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2022-05-16SL-17412 Crash at isWearingWearableTypeAndrey Kleshchev
Related to "Allow Select Avatar" feature, selection manager made avatar to persist longer.
2022-05-14SL-16746 Hide hair and fix missing light for animation previewAndrey Kleshchev
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-02-08Merged in SL-98 (pull request #864)Howard Stearns
SL-98 - Render a "ground plane" in the model upload preview, so users can see any added offset Approved-by: Andrey Kleshchev Approved-by: Andrey Lihatskiy
2022-02-08SL-98 - Remove dead codeHoward Stearns
2022-02-04SL-98 - move new renderGroundPlane from LLVOAvatar to LLModelPreviewHoward Stearns
2022-02-04SL-98 - Guessing at what might make MS compiler happier.Howard Stearns
2022-02-04SL-98 - Render a "ground plane" in the model upload preview, so users can ↵Howard Stearns
see any added offset
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-03SL-16445 Small cleanup in llvoavatarAndrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvoicevivox.cpp
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-05SL-13867 Remove unused sFreezeCounterAndrey Kleshchev
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
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-09Merge branch 'master' into DRTVWR-516-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' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-516-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 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-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-12-07SL-14467 - jellydolled animesh bounding box needs to include rigged mesh ↵Brad Payne (Vir Linden)
extents.
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-04SL-14015 - possible fix for phantom animesh attachments on macBrad Payne (Vir Linden)
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-27SL-14183, SL-14142 - impostor management improvements, animesh attachments ↵Brad Payne (Vir Linden)
update on frames when their parent does
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-10-22SL-14142 - cleanup and fixes for non-functioning impostors, status tracking ↵Brad Payne (Vir Linden)
in debug view
2020-10-20SL-14142 - impostor management cleanupBrad Payne (Vir Linden)
2020-10-19mergeBrad Payne (Vir Linden)
2020-10-16SL-14130 Jellydolls have wrong appearance when non-impostors is uncappedAndrey Kleshchev
2020-10-15Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-10-15SL-14130 - WIP, notes on impostor state managementBrad Payne (Vir Linden)
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-10-05SL-14046 - jellydoll impostor extents should be based only on system avatarBrad Payne (Vir Linden)
2020-10-02SL-14045 - add a distinguishing flag in animation info so playing animations ↵Brad Payne (Vir Linden)
can be distinguished from others
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-23Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 07:58:40 +0000