merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 27 insertions, 5 deletions

diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index 695dd2a16f..336fdfe2c3 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -138,12 +138,34 @@ void LLStyle::setFontName(const LLString& fontname)
 }
 
 
-void LLStyle::setImage(const LLString& src)
+void LLStyle::setLinkHREF(const LLString& href)
 {
-	if (src.size() >= UUID_STR_LENGTH - 1)
-	{
-		mImagep = LLUI::sImageProvider->getImageByID(LLUUID(src));
-	}
+	mLink = href;
+}
+
+BOOL LLStyle::isLink() const
+{
+	return mLink.size();
+}
+
+BOOL LLStyle::isVisible() const
+{
+	return mVisible;
+}
+
+void LLStyle::setVisible(BOOL is_visible)
+{
+	mVisible = is_visible;
+}
+
+LLUIImagePtr LLStyle::getImage() const
+{
+	return mImagep;
+}
+
+void LLStyle::setImage(const LLUUID& src)
+{
+	mImagep = LLUI::sImageProvider->getUIImageByID(src);
 }