diff options
author | callum <none@none> | 2010-10-08 16:18:47 -0700 |
---|---|---|
committer | callum <none@none> | 2010-10-08 16:18:47 -0700 |
commit | 78f0e65d63950dab8e72be6db0df22064271cfa2 (patch) | |
tree | 90a6066e49615d546673092d878112b8db51360f /indra/newview/lltoolpie.h | |
parent | bd4afcfba29a763d2253b59a86ec48228a1c6fa8 (diff) |
EXP-170 Able to buy objects in Skylight viewer (viewer code and default settings changes)
Note: this also adds a setting to turn off 'Pay' too.
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 |