summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
AgeCommit message (Collapse)Author
2022-08-30SL-18038 Remove placeholder "save as material" buttonDave Parks
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-23SL-17653 Local gltf materials #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-08-17SL-17699 Add upport for materials to texture picker: restore the asset ↵Callum Prentice
filtered inventory panel and pull in @Caladbolg's fix to make it work with more than 1 asset type from here https://bitbucket.org/lindenlab/viewer/commits/0ab6dfa12eb04238d82c7a4aea7390cbd28beacd
2022-08-17SL-17699 Add upport for materials to texture picker. Temporarilyly change ↵Callum Prentice
the filtered inventory panel to a regular one so that materials show too. A fix for this that lets us revert to the asset_filtered version is in progress and will be pulled in soon - then this change too will be reverted
2022-08-17SL-17699 Add upport for materials to texture picker. A work in progress but ↵Callum Prentice
I am about to make some larger changes to inventory code so I wanted to secure this first (missed a change)
2022-08-17SL-17699 Add upport for materials to texture picker. A work in progress but ↵Callum Prentice
I am about to make some larger changes to inventory code so I wanted to secure this first
2022-08-10Merged in DRTVWR-559-SL-17695 (pull request #1089)Callum Linden
SL-17695 Give materials and textures imported by Material Editor a sensible name - first pass - likely need to be refined but may be good enough for now Approved-by: Andrey Kleshchev Approved-by: Dave Parks
2022-08-08SL-17695 Give materials and textures imported by Material Editor a sensible ↵Callum Linden
name - first pass - likely need to be refined but may be good enough for now
2022-08-08Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-08-08SL-17927 Keep people from shooting themselves in the foot by twiddling ↵Dave Parks
deprecated settings.
2022-08-06SL-17888 Clamp some gltf material valuesAndrey Kleshchev
2022-08-05Fixed tools floater dimentions after mergeAndrey Kleshchev
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-03SL-17706 Deprecate RenderGamma and RenderFogRatio and remove dead UI from ↵Dave Parks
graphics preferences.
2022-08-03Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-08-03SL-17706 Deprecate avatar cloth and remove dead UI from graphics preferences.Dave Parks
2022-08-02Fix for: SL-17888 ORM (Occlusion, Roughness, Metal) all should be clamped ↵Callum Linden
between 0.0 and 1.0
2022-08-02SL-17706 Remove ability to disable deferred rendering and default PBR to on ↵Dave Parks
for mid and higher.
2022-07-11SL-17640 Fixed missing asset stringAndrey Kleshchev
2022-07-11SL-17665 additional checks to avoid moving protected foldersMnikolenko Productengine
2022-07-07SL-17666 Allow Map sidebar UI to be hiddenMnikolenko Productengine
2022-07-04SL-17665 Add operation to create a subfolder from selected items in InventoryMnikolenko Productengine
2022-06-30SL-17640 Use LLAgentBenefitsMgr for upload costAndrey Kleshchev
2022-06-30SL-17668 Add operation "show in inventory" on in-world avatar attachmentMnikolenko Productengine
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-27SL-17623 Revise right-click menu on inventory foldersMnikolenko Productengine
2022-06-27SL-17640 Fix name usage, fix "apply now"Andrey Kleshchev
This reverts commit 231c618a844cee26a3779b703c88d8807df872e6, instead color swatched get enabled 'apply now' in xml.
2022-06-25SL-17640 Materials Upload UI #3Andrey Kleshchev
Fixed issues in button layout Added 'unsaved changes' notification
2022-06-24SL-17436 Tools floater drops negative Z position for attachmentsAndrey Kleshchev
2022-06-24SL-17650 Add Material as a filter option to Inventory filter floaterMnikolenko Productengine
2022-06-24SL-17649 Icon for Material type in InventoryMnikolenko Productengine
2022-06-24SL-17640 Materials Upload UI #2Andrey Kleshchev
New Fee fields New Buttons
2022-06-24SL-17640 Materials Upload UI #1Andrey Kleshchev
1. Allow 'none' textures 2. Disable 'apply now' buttons 3. Switch from loading dae files to just gltf glb
2022-06-15SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports ↵Dave Parks
the first material in the GLTF file to the Material Editor
2022-06-15SL-17577 Allow setting Object for sale for L$0 from Object ProfileMnikolenko Productengine
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2022-06-10SL-17523 Add reflection probe ambiance to windlight settings and integrate ↵Dave Parks
with UI and ReflectionMapManager
2022-06-10SL-17574 Add probe detail combo box to advanced graphics preferences. Fix ↵Dave Parks
spot light shadows not working in probes.
2022-06-09SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select ↵Dave Parks
Invisible Objects" checkbox instead of "Select Reflection Probes"
2022-06-09SL-17551 Add "Select Reflection Probes" menu option and make invisible ↵Dave Parks
objects less annoying when alt-zooming in edit mode.
2022-06-02SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and ↵Dave Parks
LLPanelVolume
2022-05-31SL-17490 Only update a subset of textures each frame and remove dead debug code.Dave Parks
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-561-maint-OAndrey Lihatskiy
2022-05-24SL-17472 Add checkbox to preferences for enabling "PBR" that uses "class3" ↵Dave Parks
deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions.
2022-05-18SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219Nat Goodspeed
Update task branch from main project branch.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 09:17:24 +0000