diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-09 13:21:44 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-09 13:21:44 -0700 |
| commit | 63687148068991008a18d9b500740108afcba932 (patch) | |
| tree | efb4cd7d8fae4f422e7adab8558a845ba890ba93 /indra | |
| parent | fff55ee5d057aeb50b0c7f096ede659ee71bb25e (diff) | |
| parent | abdb549395518954d6c80e50d132d77613275ebd (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/map_placeholder.jpg | bin | 12931 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/map_placeholder.png | bin | 0 -> 7694 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg Binary files differdeleted file mode 100644 index 57204e2261..0000000000 --- a/indra/newview/skins/default/textures/icons/map_placeholder.jpg +++ /dev/null diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.png b/indra/newview/skins/default/textures/icons/map_placeholder.png Binary files differnew file mode 100644 index 0000000000..31e457aa75 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/map_placeholder.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4100849f6f..94c187e21a 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -326,7 +326,7 @@ with the same filename but different name <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" /> - <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.jpg" preload="true" /> + <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.png" preload="true" /> <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> |
