diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
| commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
| tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/llui/lltexteditor.cpp | |
| parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
| parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) | |
automated merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 7a19b7427c..3fdb48b3ca 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -720,7 +720,10 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask) } if (!LLTextBase::handleRightMouseDown(x, y, mask)) { - showContextMenu(x, y); + if(getMouseOpaque()) + { + showContextMenu(x, y); + } } return TRUE; } @@ -2507,7 +2510,7 @@ void LLTextEditor::updateLinkSegments() // then update the link's HREF to be the same as the label text. // This lets users edit Urls in-place. LLStyleConstSP style = segment->getStyle(); - LLStyle* new_style = new LLStyle(*style); + LLStyleSP new_style(new LLStyle(*style)); LLWString url_label = wtext.substr(segment->getStart(), segment->getEnd()-segment->getStart()); if (LLUrlRegistry::instance().hasUrl(url_label)) { |