diff options
author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/newview/skins/default/textures/world | |
parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/skins/default/textures/world')
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/textures/world/BeaconArrow.png | bin | 994 -> 994 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/textures/world/CameraDragDot.png | bin | 563 -> 563 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/textures/world/NoEntryLines.png | bin | 1265 -> 1265 bytes |
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/textures/world/NoEntryPassLines.png | bin | 1267 -> 1267 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png Binary files differindex 54934f738a..54934f738a 100755..100644 --- a/indra/newview/skins/default/textures/world/BeaconArrow.png +++ b/indra/newview/skins/default/textures/world/BeaconArrow.png diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png Binary files differindex 2ccf098e0f..2ccf098e0f 100755..100644 --- a/indra/newview/skins/default/textures/world/CameraDragDot.png +++ b/indra/newview/skins/default/textures/world/CameraDragDot.png diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png Binary files differindex d7496b8bd0..d7496b8bd0 100755..100644 --- a/indra/newview/skins/default/textures/world/NoEntryLines.png +++ b/indra/newview/skins/default/textures/world/NoEntryLines.png diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png Binary files differindex e4b8fc6ae2..e4b8fc6ae2 100755..100644 --- a/indra/newview/skins/default/textures/world/NoEntryPassLines.png +++ b/indra/newview/skins/default/textures/world/NoEntryPassLines.png |