summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2025-04-25 17:07:00 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2025-04-25 17:07:00 +0300
commitf450b42acfd0ac118b07eaf16a1b4c0298edbeae (patch)
treee041132ac4d5796fd0d2f6dce1072ff6070dd3d4
parenta7759f370435bdd971724aa799160fa28ae112b5 (diff)
post merge fix
-rw-r--r--indra/llui/lltextbase.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index f3eac811e7..897c910c2f 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -146,7 +146,6 @@ public:
/*virtual*/ void setStyle(LLStyleConstSP style) { mStyle = style; }
/*virtual*/ void setToken( LLKeywordToken* token ) { mToken = token; }
/*virtual*/ LLKeywordToken* getToken() const { return mToken; }
- /*virtual*/ bool getToolTip( std::string& msg ) const;
/*virtual*/ void setToolTip(const std::string& tooltip);
/*virtual*/ void dump() const;