diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 16:57:52 +0000 |
| commit | b5f9e437ea17dd9f1f3e186d6f2bf7108c279ce1 (patch) | |
| tree | f5a73b7cab3cbe4e4dcf112bc34339472a74e83a /indra/newview/skins | |
| parent | 67af47fd8676718aff3f75d28b1cd9dd77e2ca3e (diff) | |
| parent | 8e134590e6651ba36ba9d38ccf10fae249645299 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/skins')
4 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index c3e974d978..984c4fcf1d 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -12,7 +12,7 @@ can_minimize="true" visible="true" width="520" - can_resize="true" + can_resize="false" min_width="350" min_height="369"> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index c605975c8e..1e2e74f882 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -75,6 +75,7 @@ height="16" image_pressed="Info_Press" image_unselected="Info_Over" + layout="topleft" left_pad="3" right="-53" name="info_btn" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 82821a1dfe..f20526b491 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -366,10 +366,7 @@ min_val="64" name="DrawDistance" top="3" - width="255"> - <slider.commit_callback - function="Pref.UpdateMeterText" /> - </slider> + width="255" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7703fc01f7..455b4be264 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2127,6 +2127,7 @@ Clears (deletes) the media and all params from the given face. <!-- panel picks --> <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string> + <string name="NoAvatarPicksClassifiedsText">User has no picks or classfields</string> <string name="PicksClassifiedsLoadingText">Loading...</string> <!-- Multi Preview Floater --> |