diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-01 18:35:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-04 21:58:53 +0800 |
| commit | 00bb3bb6f07660bd914d29a1389342bb3060d254 (patch) | |
| tree | 431f574922494d2201718f13085f17bc6bd7fb42 /indra/newview/skins/default/textures | |
| parent | a8636720129952c10cf49ab80da21bf8b340b96c (diff) | |
| parent | 4ef9f8f14b35ed388c294d53767a0dca0e890924 (diff) | |
Merge remote-tracking branch 'secondlife/release/26.4' into 26.4
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Inv_Script_Luau.png | bin | 0 -> 807 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/howto.png | bin | 1306 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/ComboButton_Off.png | bin | 338 -> 559 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/ComboButton_Selected.png | bin | 15216 -> 541 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png | bin | 203 -> 435 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png | bin | 302 -> 436 bytes |
7 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/icons/Inv_Script_Luau.png b/indra/newview/skins/default/textures/icons/Inv_Script_Luau.png Binary files differnew file mode 100644 index 0000000000..5666193fab --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Inv_Script_Luau.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 5699174f4f..8f6abf67a0 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -143,7 +143,6 @@ with the same filename but different name <texture name="Command_Destinations_Icon" file_name="toolbar_icons/destinations.png" preload="true" /> <texture name="Command_Gestures_Icon" file_name="toolbar_icons/gestures.png" preload="true" /> <texture name="Command_Grid_Status_Icon" file_name="toolbar_icons/grid_status.png" preload="true" /> - <texture name="Command_HowTo_Icon" file_name="toolbar_icons/howto.png" preload="true" /> <texture name="Command_Inventory_Icon" file_name="toolbar_icons/inventory.png" preload="true" /> <texture name="Command_Map_Icon" file_name="toolbar_icons/map.png" preload="true" /> <texture name="Command_Marketplace_Icon" file_name="toolbar_icons/marketplace.png" preload="true" /> @@ -335,6 +334,7 @@ with the same filename but different name <texture name="Inv_Object_Multi" file_name="icons/Inv_Object_Multi.png" preload="false" /> <texture name="Inv_Pants" file_name="icons/Inv_Pants.png" preload="false" /> <texture name="Inv_Script" file_name="icons/Inv_Script.png" preload="false" /> + <texture name="Inv_Script_Luau" file_name="icons/Inv_Script_Luau.png" preload="false" /> <texture name="Inv_Shirt" file_name="icons/Inv_Shirt.png" preload="false" /> <texture name="Inv_Shoe" file_name="icons/Inv_Shoe.png" preload="false" /> <texture name="Inv_Skin" file_name="icons/Inv_Skin.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png Binary files differdeleted file mode 100644 index 8594d71113..0000000000 --- a/indra/newview/skins/default/textures/toolbar_icons/howto.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png Binary files differindex 71c16e8414..1bd7f3228d 100644 --- a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png Binary files differindex 715b401ce5..c0566912e3 100644 --- a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png +++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png Binary files differindex e9f15dbad4..f00c18d1a8 100644 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png Binary files differindex 753c38bdad..da419b94ea 100644 --- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png +++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png |
