summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
AgeCommit message (Collapse)Author
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
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-10SL-17923 "Title" and "Description" labels are not displayed in "Picks" tabAndrey Kleshchev
Fixed unlabeled fields in picks: For consistency purposes and for clarity both picks and classifieds should display title and descriprion labels. Fixed extra large spacing in classifieds
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-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-08-04Merge branch master (DRTVWR-561) into DRTVWR-483Andrey Kleshchev
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-20SL-17798 floater now allows 1024 texturesAndrey Kleshchev
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-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-561-maint-OAndrey Lihatskiy
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
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-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-22SL-17329: Add advanced developer menu button to purge the disk cacheCosmic Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 16:33:53 +0000