diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
| commit | 615babe6187e14ece4a43ce713f9dfadf90de9d3 (patch) | |
| tree | ce895186849518b6ff7395f3153a8e5f4917e673 /indra/newview/skins/default | |
| parent | e09d45aef8e2d2167e2020a328c0606c8c2f492c (diff) | |
| parent | 7f36a12cbbbf4bd914d0890bd6235425753140eb (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Generic_Group.png | bin | 3354 -> 1523 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about_land.xml | 31 |
2 files changed, 1 insertions, 30 deletions
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png Binary files differindex fdd65b49e1..9d76f75d0f 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Group.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group.png 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 593bbe4b5e..58ea7cec9c 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1609,41 +1609,12 @@ Only large parcels can be listed in search. name="set_media_url" width="50" top_delta="0"/> - <text - type="string" - length="1" - follows="left|top" - height="20" - layout="topleft" - left="10" - name="CurrentURL:" - width="100" - top_pad="10"> - Current Page: - </text> - <button - follows="top|right" - height="23" - image_overlay="Refresh_Off" - layout="topleft" - name="reset_media_url" - left_pad="0" - tool_tip="Refresh URL" - width="23" - top_delta="0"/> - <text - follows="left|top" - height="16" - layout="topleft" - left_pad="10" - name="current_url" - width="300" /> <check_box follows="top|left" height="16" label="Hide URL" layout="topleft" - left_delta="-36" + left="110" name="hide_media_url" tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types." width="50" |
