merge

1 files changed, 1 insertions, 5 deletions

diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index 293935e251..3b15a156a8 100644
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -83,14 +83,11 @@ public:
 	/// return the SL location that this Url describes, or "" if none.
 	std::string getLocation() const { return mLocation; }
 
-	/// is this a match for a URL that should not be hyperlinked?
-	bool isLinkDisabled() const { return mDisabledLink; }
-
 	/// Change the contents of this match object (used by LLUrlRegistry)
 	void setValues(U32 start, U32 end, const std::string &url, const std::string &label,
 	               const std::string &tooltip, const std::string &icon,
 				   const LLStyle::Params& style, const std::string &menu, 
-				   const std::string &location, bool disabled_link);
+				   const std::string &location);
 
 private:
 	U32         mStart;
@@ -102,7 +99,6 @@ private:
 	std::string mMenuName;
 	std::string mLocation;
 	LLStyle::Params mStyle;
-	bool        mDisabledLink;
 };
 
 #endif