diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-21 18:13:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-21 18:13:54 -0700 |
| commit | f95974637e720a7968b959d80cc4ab68260ccbe5 (patch) | |
| tree | 17ac20a14f8c6cfce93922cd050e954dddcce1f2 /indra/newview/llconversationview.h | |
| parent | b5583906d0cce652f456851732db5b1c19659662 (diff) | |
| parent | 18f294715822bedaea3bafa9dfec1ee42c12353c (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llconversationview.h')
| -rwxr-xr-x | indra/newview/llconversationview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 075ad09d5b..0b98c34c73 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -101,6 +101,8 @@ public: void onMouseEnter(S32 x, S32 y, MASK mask); void onMouseLeave(S32 x, S32 y, MASK mask); + /*virtual*/ S32 getLabelXPos(); + protected: friend class LLUICtrlFactory; LLConversationViewParticipant( const Params& p ); @@ -125,7 +127,7 @@ private: static bool sStaticInitialized; // this variable is introduced to improve code readability static S32 sChildrenWidths[ALIC_COUNT]; static void initChildrenWidths(LLConversationViewParticipant* self); - void computeLabelRightPadding(); + void updateChildren(); LLView* getItemChildView(EAvatarListItemChildIndex child_view_index); }; |