summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
AgeCommit message (Collapse)Author
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-18Merged master into DRTVWR-497Andrey Kleshchev
2020-05-15SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
2020-05-14SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# 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-04Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-04-20SL-12904 FIXED Camera Preset does not restore correctly when sittingMnikolenko Productengine
2020-03-31SL-379 Render selected joint yellow when Avatar tab is openAndrey Kleshchev
2020-03-25SL-12478 Long names are not beautiful in nametagsAndrey Kleshchev
2020-03-24SL-12237 Invisible avatars don't need detailed updatesAndrey Kleshchev
2020-03-24SL-12237 Small adjustment to render complexity performanceAndrey Kleshchev
2020-03-24SL-12237 Invisible avatars don't need detailed updatesAndrey Kleshchev
2020-03-24SL-12237 Small adjustment to render complexity performanceAndrey Kleshchev
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
2020-02-25Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-21Merge master (v 6.3.8) into DRTVWR-440Dave Houlton
2020-02-21mergeBrad Payne (Vir Linden)
2020-02-05SL-4354 Not loaded avatars should stay cloud longerAndrey Kleshchev
2020-02-05Merge branch 'DRTVWR-499' into DRTVWR-500Andrey Lihatskiy
2020-02-05Revert SL-4354Andrey Kleshchev
2020-02-04SL-4354 Used wrong conditionAndrey Kleshchev
2020-02-03Merge branch 'DRTVWR-499' into DRTVWR-500Andrey Lihatskiy
2020-01-30SL-4354 Mesh avatars look broken while loading.andreykproductengine
2020-01-29SL-4354 Mesh avatars look broken while loading.andreykproductengine
2020-01-06Merged in viewer-releaseAndreyL ProductEngine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-16mergeBrad Payne (Vir Linden)
2019-11-27Downstream merge from lindenlab/viewer-lynxAndreyL ProductEngine
2019-11-20SL-10499 - handle package info from benefits serviceBrad Payne (Vir Linden)
2019-11-14SL-10499, SL-10497 - use LLAgentBenefits infoBrad Payne (Vir Linden)
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from lindenlab/viewer-servalAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-29SL-12196 Crash at updateMeshTexturesandreykproductengine
2019-10-20SL-12152 Minimizing chances of calling 'first use' twice.andreykproductengine
2019-10-18SL-12152 Fix for missing Hair Preview in texture uploadingandreykproductengine