diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-10-19 19:55:19 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-10-19 19:55:19 +0300 |
| commit | d97355a19f3b88512105965cfd752956f0230b41 (patch) | |
| tree | c95f1b6a700eb08911257b90003e0e6c0380c54f /indra/llui | |
| parent | c683151587067cb2758206432610d4ff4884036e (diff) | |
STORM-390 FIXED "Place Profile" appeared instead of "Resident Profile" after clicking on user name in a nearby chat toast.
Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector.
This change rolls back the fix of STORM-358.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 9adeddca99..758df418e8 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1622,7 +1622,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para style_params.fillFrom(getDefaultStyleParams()); S32 part = (S32)LLTextParser::WHOLE; - if(mParseHTML) + if (mParseHTML && !style_params.is_link) // Don't search for URLs inside a link segment (STORM-358). { S32 start=0,end=0; LLUrlMatch match; |