summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2022-10-26Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR...Dave Parks
2022-10-26SL-18443 Allow nulling out of override data and implement new override messag...Dave Parks
2022-10-26Merged in SL-17005_cosmic_win8 (pull request #1106)Sabrina Shanman
2022-10-26SL-18446 Support "multiple textures" in Live material overridesAndrey Kleshchev
2022-10-26Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-10-26Increment viewer version to 6.6.7Nat Goodspeed
2022-10-26SL-18446 Terse-update selection set from live material editor #1Andrey Kleshchev
2022-10-26SL-18444 Either connection should be create in onOpen or disconnect happen in...Andrey Kleshchev
2022-10-26SL-18444 Live Material Editor updating with selectionAndrey Kleshchev
2022-10-25Bump Teamcity for new Project Viewer build of DRTVWR-559Brad Kittenbrink
2022-10-25Xcode build fixes for DRTVWR-559Brad Kittenbrink
2022-10-25SL-18008 Add "Save/Edit Materials" buttons to attachment's right click menuAndrey Kleshchev
2022-10-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR...Dave Parks
2022-10-24SL-18105 Add mechanism for applying overrides that were received before assoc...Dave Parks
2022-10-24SL-18414 Smarter material editor's cancel for overridesAndrey Kleshchev
2022-10-24SL-18432 Fix for alpha sortingAndrey Lihatskiy
2022-10-24Re-merged llvovolume.cppAndrey Kleshchev
2022-10-24SL-17532 Fix some changes vanishing over merge to D559Andrey Kleshchev
2022-10-24Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR...Dave Parks
2022-10-24SL-17021 Fix some changes vanishing over merge to D559 #2Andrey Kleshchev
2022-10-24SL-17021 Fix some changes vanishing over merge to D559Andrey Kleshchev
2022-10-22SL-18105 When saving an object's material to inventory, save the version that...Dave Parks
2022-10-22SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's no...Dave Parks
2022-10-21SL-18105 Hook up live material editor to current selection set and implicitly...Dave Parks
2022-10-21SL-18105 Clean up class1/deferred/materialF.glsl (merge cleanup), make overri...Dave Parks
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
2022-10-20SL-18105 Add remaining parameters to applyOverrideDave Parks
2022-10-20Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR...Dave Parks
2022-10-20SL-18105 Fix for overrides not showing until a forced mesh update.Dave Parks
2022-10-20Increment viewer version to 6.6.6Nat Goodspeed
2022-10-20SL-18411: Copy over LLGLTFMaterial changes (most notably various getters/sett...Cosmic Linden
2022-10-20SL-18391 Fix local gltf materials to retain a copy of materialAndrey Kleshchev
2022-10-19Xcode compat fix for SL-18105 material overridesBrad Kittenbrink
2022-10-19SL-18105 Hook up TE override material to render pipe by way of render material.Dave Parks
2022-10-19SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and ad...Dave Parks
2022-10-19SL-18105 viewer side for handling Material Override LargeGenericMessageBrad Kittenbrink
2022-10-18Better fix for mac/xcode compatibility problem in SL-18391. Keep using unord...Brad Kittenbrink
2022-10-18include the right header now that uuid_mat_map_t is std::map for SL-18391Brad Kittenbrink
2022-10-18Fix ror mac build error in SL-18391 lifetime managementBrad Kittenbrink
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
2022-10-18SL-18008 Mac build fixAndrey Kleshchev
2022-10-18SL-18008 Updated Save and Edit PBR buttonsAndrey Kleshchev
2022-10-17More work on SL-17697 LLMaterialEditor now uses new override diffing code whe...Brad Kittenbrink
2022-10-17Merged in SL-18340 (pull request #1158)Sabrina Shanman
2022-10-17WIP for SL-17697 live editing now computes diffs of changed material properti...Brad Kittenbrink
2022-10-17Continuing work on SL-17697 Live editing with material overrides.Brad Kittenbrink
2022-10-17SL-18008 Placeholder functionality for PBR Edit buttonAndrey Kleshchev
2022-10-17SL-18008 Add Save and Edit buttons to right click menu for materialsAndrey Kleshchev
2022-10-17SL-18221 Water texture does not load after clearing cacheAndrey Kleshchev
2022-10-17SL-17779 Texture position changes were ignored on rigged meshesAndrey Kleshchev