diff options
| author | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
| commit | 410a084f9a2e030efda635f5a51280b599ab7f78 (patch) | |
| tree | 2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/llui/lltextbase.cpp | |
| parent | dad992ea31b6b823c316400e61d50d1aa9e52330 (diff) | |
| parent | fcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff) | |
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rwxr-xr-x | 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 cc171661ce..5ec4cf4fe5 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1029,7 +1029,7 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask) { LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y); - if (cur_segment && cur_segment->handleMouseUp(x, y, mask)) + if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask)) { // Did we just click on a link? if (mURLClickSignal |