diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-10 08:38:49 -0700 | 
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-10 08:38:49 -0700 | 
| commit | 8366efc339e7eca3918d7246b3bb7a9ba61ce765 (patch) | |
| tree | bd68ba514d74b918f0ef1d9eea62b41d86590b0d | |
| parent | 5dc8738076d158aa74a93f7f3630a17d9102fdc4 (diff) | |
CHUI-283, fixed a build problem and also added a missing file.
| -rwxr-xr-x | indra/newview/llconversationview.h | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml | 33 | 
2 files changed, 34 insertions, 1 deletions
| diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index a7f468cb27..0a008475a3 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -35,7 +35,7 @@  #include "llstyle.h"  #include "llcallbackmap.h"  #include "lltextbox.h" -#include "llbutton.h"; +#include "llbutton.h"  class LLIMFloaterContainer; diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml new file mode 100755 index 0000000000..0cff25e083 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<conversation_view_participant +  folder_arrow_image="ForSale_Badge" +  folder_indentation="8" +  item_height="20"  +  item_top_pad="4" +  selection_image="Rounded_Square" +  mouse_opaque="true" +  follows="left|top|right" +> +<view_profile_button +     height="20" +     image_overlay="Web_Profile_Off" +     layout="topleft" +     left_pad="5" +     right="200" +     name="profile_btn" +     tab_stop="false" +     tool_tip="View profile" +     top_delta="-2" +     width="20" /> + <info_button +     height="16" +     image_pressed="Info_Press" +     image_unselected="Info_Over" +     layout="topleft" +     left_pad="3" +     right="225" +     name="info_btn" +     tab_stop="false" +     top_delta="0" +     width="16" /> +</conversation_view_participant> | 
