diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:17:55 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:17:55 +0300 |
| commit | 59ab8e78f42a9fcbd0da771c3ab2ed821e84c5e4 (patch) | |
| tree | faa3da3f5304cca9e529e02d6ee4053274d53a41 /indra/newview/skins/default/textures/icons | |
| parent | 3f6c9e2f7a8e1801fefe81f5f740501fda7dba69 (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png | bin | 0 -> 231 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png | bin | 0 -> 231 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png | bin | 0 -> 224 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png | bin | 0 -> 218 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png | bin | 0 -> 217 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png | bin | 0 -> 215 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png Binary files differnew file mode 100644 index 0000000000..9a81c5f94b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardMenu_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png Binary files differnew file mode 100644 index 0000000000..88012cf8d1 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardMenu_Off.png diff --git a/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png Binary files differnew file mode 100644 index 0000000000..ab02e7d42d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardMenu_Press.png diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png Binary files differnew file mode 100644 index 0000000000..63b4bd2127 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Disabled.png diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png Binary files differnew file mode 100644 index 0000000000..4200182b0c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Off.png diff --git a/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png Binary files differnew file mode 100644 index 0000000000..e12887f489 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ClipboardSmallMenu_Press.png |
