diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:17:03 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:17:03 +0300 |
| commit | 2dc99d84cee2ce7cd01b83e6b9835907825b450a (patch) | |
| tree | c24aee1387fddec6d3a0d82c1632d32da4d8d209 /indra/newview/skins/default/textures | |
| parent | 05800a402b76f066fb889888723a44369d9fd7f8 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/fmod_logo.png | bin | 0 -> 14486 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/havok_logo.png | bin | 0 -> 41488 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/vivox_logo.png | bin | 0 -> 2331 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/ProgressBarSolid.png | bin | 0 -> 208 bytes |
5 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png Binary files differnew file mode 100644 index 0000000000..5a50e0ad34 --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png Binary files differnew file mode 100644 index 0000000000..ff1ea3a72e --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/havok_logo.png diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png Binary files differnew file mode 100644 index 0000000000..6f20e87b7a --- /dev/null +++ b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 03c6237797..67cdcedebc 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -498,6 +498,7 @@ with the same filename but different name <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" /> <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" /> + <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" /> <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" /> <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> diff --git a/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png Binary files differnew file mode 100644 index 0000000000..ec0926bfa1 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png |
