diff options
author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-27 10:11:57 -0700 |
---|---|---|
committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-27 10:11:57 -0700 |
commit | 398019ffb2a036813c6c89a677e9534faa178330 (patch) | |
tree | e94c605e38c44798f6b57397cc5f1838f4965571 /indra/newview | |
parent | d11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (diff) |
ER-910: Parcel privacy. Got new icons, cleaned up xml linkage a bit.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png | bin | 730 -> 3011 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png | bin | 814 -> 3194 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png | bin | 0 -> 3189 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_topinfo_bar.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 2 |
6 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png Binary files differindex 8b3376e514..064687ed0f 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png Binary files differindex 4e474d7f5a..956e02b14d 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png Binary files differnew file mode 100644 index 0000000000..434caeda8b --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e8fe3cd82f..e63e25b308 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -371,6 +371,7 @@ with the same filename but different name <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" /> <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" /> <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" /> + <texture name="Parcel_HiddenAVsOn_Light" file_name="icons/Parcel_HiddenAVsOn_Light.png" preload="false" /> <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" /> <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index f744e8d4cb..d9a0eb884c 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -91,7 +91,7 @@ <icon follows="right|top" height="13" - image_name="Parcel_HiddenAVsOff_Dark" + image_name="Parcel_HiddenAVsOn_Light" left="2" name="hidden_av_icon" top="3" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index adb8cf3172..6041d750da 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -129,7 +129,7 @@ height="18" top="21" follows="right|top" - image_name="Parcel_HiddenAVsOn_Dark" + image_name="Parcel_HiddenAVsOn_Light" /> <combo_button name="Location History" |