diff options
author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/newview/llfavoritesbar.cpp | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r-- | indra/newview/llfavoritesbar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index ae5be8cc7c..8406ddeeca 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -232,13 +232,15 @@ public: virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) { - mMouseDownSignal(this, x, y, mask); + if (mMouseDownSignal) + (*mMouseDownSignal)(this, x, y, mask); return LLMenuItemCallGL::handleMouseDown(x, y, mask); } virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) { - mMouseUpSignal(this, x, y, mask); + if (mMouseUpSignal) + (*mMouseUpSignal)(this, x, y, mask); return LLMenuItemCallGL::handleMouseUp(x, y, mask); } |