diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
| commit | d23f7df822b6c0557f9426b5e1aa660b77aba01e (patch) | |
| tree | 2e86e4ec60018beabd35a54cc18fdf322a504269 /indra/newview/lltoolpie.h | |
| parent | cf64ecb41dbbdcdc3c512510c4a7ebd28c832314 (diff) | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 65cb3e36a7..77200a1da4 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -80,6 +80,7 @@ private: BOOL useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); void showVisualContextMenuEffect(); + ECursorType cursorFromObject(LLViewerObject* object); bool handleMediaClick(const LLPickInfo& info); bool handleMediaHover(const LLPickInfo& info); @@ -96,8 +97,8 @@ private: LLPointer<LLViewerObject> mClickActionObject; U8 mClickAction; LLSafeHandle<LLObjectSelection> mLeftClickSelection; - + BOOL mClickActionBuyEnabled; + BOOL mClickActionPayEnabled; }; - #endif |