build fixes

3 files changed, 3 insertions, 3 deletions

diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
index 35f177238d..cb40c85582 100644
--- a/indra/llui/lluistring.h
+++ b/indra/llui/lluistring.h
@@ -63,8 +63,6 @@ public:
 	LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); }
 	~LLUIString() { delete mArgs; }
 
-	~LLUIString() { delete mArgs; }
-
 	void assign(const std::string& instring);
 	LLUIString& operator=(const std::string& s) { assign(s); return *this; }
 
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index ebd0f912b8..13bfeb5e2d 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -174,7 +174,7 @@ bool LLUrlEntryBase::isLinkDisabled() const
 	// this allows us to have a global setting to turn off text hyperlink highlighting/action
 	bool globally_disabled = LLUI::sSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
 
-	return mDisabledLink || globally_disabled;
+	return globally_disabled;
 }
 
 static std::string getStringAfterToken(const std::string str, const std::string token)
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 1a16056041..43a667c390 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -94,6 +94,8 @@ public:
 
 	virtual LLUUID	getID(const std::string &string) const { return LLUUID::null; }
 
+	bool isLinkDisabled() const;
+
 protected:
 	std::string getIDStringFromUrl(const std::string &url) const;
 	std::string escapeUrl(const std::string &url) const;