diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
| commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
| tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/llui/lltextbase.h | |
| parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
| parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index e1c6cc36ab..dc3671eab1 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -187,9 +187,6 @@ public: const LLFontGL* getDefaultFont() const { return mDefaultFont; } LLStyle::Params getDefaultStyle(); - // tell the text object to suppress auto highlighting of a specific URL - void addBlackListUrl(const std::string &url); - public: // Fired when a URL link is clicked commit_signal_t mURLClickSignal; @@ -312,7 +309,6 @@ protected: void updateRects(); void needsScroll() { mScrollNeeded = TRUE; } void replaceUrlLabel(const std::string &url, const std::string &label); - bool isBlackListUrl(const std::string &url) const; protected: // text segmentation and flow @@ -364,9 +360,6 @@ protected: LLView* mDocumentView; class LLScrollContainer* mScroller; - // list of URLs to suppress from automatic hyperlinking - std::vector<std::string> mBlackListUrls; - // transient state bool mReflowNeeded; // need to reflow text because of change to text contents or display region bool mScrollNeeded; // need to change scroll region because of change to cursor position |