diff options
Diffstat (limited to 'indra/newview/skins')
12 files changed, 38 insertions, 46 deletions
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png Binary files differindex 956e02b14d..956e02b14d 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png Binary files differindex 434caeda8b..434caeda8b 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png Binary files differindex 064687ed0f..064687ed0f 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png Binary files differnew file mode 100644 index 0000000000..5465650d0c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e63e25b308..dad6dfd4cf 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -369,9 +369,10 @@ with the same filename but different name <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" /> <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" /> <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_SeeAVsOff_Dark" file_name="icons/Parcel_SeeAVsOff_Dark.png" preload="false" /> + <texture name="Parcel_SeeAVsOn_Dark" file_name="icons/Parcel_SeeAVsOn_Dark.png" preload="false" /> + <texture name="Parcel_SeeAVsOff_Light" file_name="icons/Parcel_SeeAVsOff_Light.png" preload="false" /> + <texture name="Parcel_SeeAVsOn_Light" file_name="icons/Parcel_SeeAVsOn_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/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 612d2a3bfe..ac186d7737 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1205,8 +1205,8 @@ Only large parcels can be listed in search. No Pushing (Region Override) </panel.string> <panel.string - name="hidden_avs_text"> - Hidden Avatars + name="see_avs_text"> + See and chat with avatars on this parcel </panel.string> <text type="string" @@ -1218,26 +1218,17 @@ Only large parcels can be listed in search. left="10" name="allow_label" top="10" - width="278"> + width="270"> Allow other Residents to: </text> <check_box height="16" - label="Edit Terrain" - layout="topleft" - left="14" - name="edit land check" - tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land." - top_pad="4" - width="147i" /> - <check_box - height="16" label="Fly" layout="topleft" name="check fly" tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land." left_pad="4" - width="150" /> + width="128" /> <text type="string" length="1" @@ -1317,7 +1308,16 @@ Only large parcels can be listed in search. name="check group scripts" top_delta="0" width="70" /> - <text + <check_box + height="16" + label="See Avatars" + layout="topleft" + left="14" + name="SeeAvatarsCheck" + tool_tip="Allow avatars on other parcels to see and chat with avatars on this parcel." + top_pad="5" + width="119" /> + <text type="string" text_color="white" length="1" @@ -1355,15 +1355,6 @@ Only large parcels can be listed in search. name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results" width="280" /> - <check_box - height="16" - label="Private Parcel" - layout="topleft" - left_pad="5" - name="PrivateParcelCheck" - tool_tip="Prevents avatars from seeing into or out of the parcel." - top_delta="0" - width="119" /> <combo_box enabled="false" height="23" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a6f1b5bf5c..503f8dfe64 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5655,11 +5655,11 @@ This area has building disabled. You can't build or rez objects here. <notification icon="notify.tga" - name="HiddenAVs" + name="SeeAvatars" persist="true" type="notify" unique="true"> -This parcel hides avatars from view from another parcel. You can't see others outside the parcel, and those outside are not able to see you. +This parcel hides avatars and text chat from another parcel. You can't see other residents outside the parcel, and those outside are not able to see you. Regular text chat on channel 0 is also blocked. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 9c6ee32d45..e280115bda 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -154,13 +154,13 @@ translate="false" value="Parcel_DamageNo_Dark" /> <string - name="icon_HiddenAVsOff" + name="icon_SeeAVs_Off" translate="false" - value="Parcel_HiddenAVsOff_Dark" /> + value="Parcel_SeeAVsOff_Dark" /> <string - name="icon_HiddenAVsOn" + name="icon_SeeAVs_On" translate="false" - value="Parcel_HiddenAVsOn_Dark" /> + value="Parcel_SeeAVsOn_Dark" /> <button follows="top|left" height="24" @@ -554,10 +554,10 @@ <icon follows="top|left" height="18" - image_name="Parcel_HiddenAVsOff_Dark" + image_name="Parcel_SeeAVsOff_Dark" layout="topleft" left="10" - name="hidden_av_icon" + name="see_avatars_icon" top_pad="7" width="22" /> <text @@ -565,15 +565,15 @@ height="14" layout="topleft" left_pad="8" - name="hidden_avs_label" - value="Hidden Avatars:" + name="see_avatars_label" + value="See Avatars:" width="90" /> <text follows="left|top" height="14" layout="topleft" left_pad="0" - name="hidden_av_value" + name="see_avatars_value" value="Off" width="60" /> <button 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 d9a0eb884c..79f29777ce 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -91,9 +91,9 @@ <icon follows="right|top" height="13" - image_name="Parcel_HiddenAVsOn_Light" + image_name="Parcel_SeeAVsOff_Light" left="2" - name="hidden_av_icon" + name="see_avatars_icon" top="3" visible="false" width="14" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 416e1ac620..db6cd559b8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1761,7 +1761,7 @@ Returns the maximum number of prims allowed on the parcel at pos <string name="LSLTipText_llGetParcelDetails" translate="false"> list llGetParcelDetails(vector pos, list params) Returns the parcel details specified in params for the parcel at pos. - Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _HIDDEN_AVS + Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS </string> <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false"> llSetLinkPrimitiveParams(integer linknumber, list rules) @@ -3133,7 +3133,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlAdultIconTooltip">Adult Region</string> <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> <string name="LocationCtrlGeneralIconTooltip">General Region</string> - <string name="LocationCtrlHiddenAVsTooltip">Hidden Avatars Parcel</string> + <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> 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 6041d750da..44436fb6f2 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -123,13 +123,13 @@ font="SansSerifSmall" text_color="TextFgColor" /> - <hidden_av_icon - name="hidden_av_icon" + <see_avatars_icon + name="see_avatars_icon" width="22" height="18" top="21" follows="right|top" - image_name="Parcel_HiddenAVsOn_Light" + image_name="Parcel_SeeAVsOff_Light" /> <combo_button name="Location History" diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml index 9c2ba221ba..ba148cf421 100644 --- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml @@ -113,8 +113,8 @@ font="SansSerifSmall" text_color="TextFgColor" /> - <hidden_av_icon - name="hidden_av_icon" + <see_avatars_icon + name="see_avatars_icon" width="0" height="0" visible="false" |
