diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
| commit | cf9239cabcf7999a2d2393bd4bdb6fc08e27c09c (patch) | |
| tree | b366355f955b7bf55197ef6caa105881da88df32 /indra/newview/lltoolpie.h | |
| parent | 8135ddac021d3ea1aba2100f862bdb58eff33d07 (diff) | |
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 328653d2b8..f6a67c13b1 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -42,9 +42,12 @@ class LLObjectSelection; class LLToolPie : public LLTool, public LLSingleton<LLToolPie> { + LOG_CLASS(LLToolPie); public: LLToolPie( ); + // Virtual functions inherited from LLMouseHandler + virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); @@ -81,9 +84,15 @@ private: BOOL useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); void showVisualContextMenuEffect(); + + bool handleMediaClick(const LLPickInfo& info); + bool handleMediaHover(const LLPickInfo& info); + bool handleMediaMouseUp(); + private: BOOL mGrabMouseButtonDown; BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region + LLUUID mMediaMouseCaptureID; LLPickInfo mPick; LLPickInfo mHoverPick; LLPointer<LLViewerObject> mClickActionObject; |