From 0ada8944ee7427c2ea175602b6a139f2fa23cf73 Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Wed, 5 Jun 2013 19:40:06 +0300 Subject: CHUI-964 ADD FIX Oversized "To" input field hides actual IM text --- indra/llui/lltextbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/lltextbase.h') diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 20a73387b5..2fb58d468a 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -507,7 +507,7 @@ protected: void initFromParams(const Params& p); virtual void beforeValueChange(); virtual void onValueChange(S32 start, S32 end); - virtual bool useLabel(); + virtual bool useLabel() const; // draw methods void drawSelectionBackground(); // draws the black box behind the selected text -- cgit v1.2.3 From 882ab04ef3e412716f0f034e348007b5f3016f3c Mon Sep 17 00:00:00 2001 From: mberezhnoy Date: Thu, 13 Jun 2013 20:21:24 +0300 Subject: CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM") Added callback for friendship checking --- indra/llui/lltextbase.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llui/lltextbase.h') diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 2fb58d468a..a74e97cac8 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -258,6 +258,8 @@ public: friend class LLNormalTextSegment; friend class LLUICtrlFactory; + typedef boost::signals2::signal is_friend_signal_t; + struct LineSpacingParams : public LLInitParam::ChoiceBlock { Alternative multiple; @@ -434,6 +436,7 @@ public: virtual void appendImageSegment(const LLStyle::Params& style_params); virtual void appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo); boost::signals2::connection setURLClickedCallback(const commit_signal_t::slot_type& cb); + boost::signals2::connection setIsFriendCallback(const is_friend_signal_t::slot_type& cb); void setWordWrap(bool wrap); LLScrollContainer* getScrollContainer() const { return mScroller; } @@ -648,6 +651,9 @@ protected: // Fired when a URL link is clicked commit_signal_t* mURLClickSignal; + // Used to check if user with given ID is avatar's friend + is_friend_signal_t* mIsFriendSignal; + LLUIString mLabel; // text label that is visible when no user text provided }; -- cgit v1.2.3