diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltextbase.h | 6 | ||||
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 5 | 
3 files changed, 8 insertions, 7 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 2d0d5c12cb..17e41d9e24 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1630,7 +1630,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para  					// Text will be replaced during rendering with the icon,  					// but string cannot be empty or the segment won't be  					// added (or drawn). -					appendImageSegment(part, icon); +					appendImageSegment(icon);  				}  			} @@ -1702,7 +1702,7 @@ void LLTextBase::appendLineBreakSegment(const LLStyle::Params& style_params)  	insertStringNoUndo(getLength(), utf8str_to_wstring("\n"), &segments);  } -void LLTextBase::appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params) +void LLTextBase::appendImageSegment(const LLStyle::Params& style_params)  {  	if(getPlainText())  	{ diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 92876e20d6..fe8ebb1b80 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -196,6 +196,9 @@ public:  	const LLFontGL*			getDefaultFont() const					{ return mDefaultFont; } +	void					appendLineBreakSegment(const LLStyle::Params& style_params); +	void					appendImageSegment(const LLStyle::Params& style_params); +  public:  	// Fired when a URL link is clicked  	commit_signal_t mURLClickSignal; @@ -319,9 +322,6 @@ protected:  	void							updateRects();  	void							needsScroll() { mScrollNeeded = TRUE; }  	void							replaceUrlLabel(const std::string &url, const std::string &label); - -	void							appendLineBreakSegment(const LLStyle::Params& style_params); -	void							appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params);  	void							appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());  	void							appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 7c5586ec96..76263a4307 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3022,8 +3022,9 @@ void insert_maturity_into_textbox(LLTextBox* target_textbox, LLFloater* names_fl  	std::string text_after_rating = str_to_parse.substr(maturity_pos + MATURITY.length());  	target_textbox->setText(text_before_rating); -	// any text may be here instead of "icon" except "" -	target_textbox->appendText(std::string("icon"), false, style); + +	target_textbox->appendImageSegment(style); +  	target_textbox->appendText(LLViewerParcelMgr::getInstance()->getSelectionRegion()->getSimAccessString(), false);  	target_textbox->appendText(text_after_rating, false);  }  | 
