From d50ab8b58a45c55888ddebbb77ec0a2209d286a5 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 7 Jun 2010 14:51:20 -0700 Subject: thumbnail previews background image restored reviewed by erica --- indra/newview/lltoolmorph.cpp | 2 +- .../skins/default/textures/avatar_thumb_bkgrnd.png | Bin 0 -> 17692 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png (limited to 'indra/newview') diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 8996157258..fa21b1a866 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -96,7 +96,7 @@ LLVisualParamHint::LLVisualParamHint( mCamTargetJoint(jointp) { LLVisualParamHint::sInstances.insert( this ); - mBackgroundp = LLUI::getUIImage("avatar_thumb_bkgrnd.j2c"); + mBackgroundp = LLUI::getUIImage("avatar_thumb_bkgrnd.png"); llassert(width != 0); llassert(height != 0); diff --git a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png new file mode 100644 index 0000000000..84cc2159c1 Binary files /dev/null and b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png differ -- cgit v1.2.3 From 9b9a79084c1d6bdee0b8a988b21b0b34512ead49 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 7 Jun 2010 17:17:36 -0700 Subject: added missing help_topics for kate --- indra/newview/skins/default/xui/en/panel_edit_wearable.xml | 1 + indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 1 + indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 1 + 3 files changed, 3 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 67ff71cef1..9537df3582 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -7,6 +7,7 @@ label="Wearable" layout="topleft" left="0" + help_topic="edit_wearable" name="panel_edit_wearable" top="0" width="333"> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 769f9b7bbf..ca05c36392 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -7,6 +7,7 @@ follows="all" label="Outfit Edit" layout="topleft" + help_topic="edit_outfit" left="0" min_height="350" name="outfit_edit" diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 13e1f5ba5c..de1f2cf31b 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -30,6 +30,7 @@ height="490" name="outfitslist_tab" background_visible="true" + help_topic="my_outfits_tab" follows="all" label="MY OUTFITS" layout="topleft" -- cgit v1.2.3