summaryrefslogtreecommitdiff
path: root/indra/newview/lljoystickbutton.h
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
commit3194c89177e75db524c2c4e09cd40f239426a774 (patch)
tree6b042ef3c8a9e983659d128296aeeedefa62fefd /indra/newview/lljoystickbutton.h
parent4bb5cd169b297efbcf1bdb58a45be24932cf8241 (diff)
parentc5732c824fcde73953cfdf971ba35a88abd54d0c (diff)
Merging viewer2 changes into avp branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
-rw-r--r--indra/newview/lljoystickbutton.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h
index 4c657913b8..0465f78031 100644
--- a/indra/newview/lljoystickbutton.h
+++ b/indra/newview/lljoystickbutton.h
@@ -78,6 +78,8 @@ public:
static void onBtnHeldDown(void *userdata); // called by llbutton callback handler
void setInitialQuadrant(EJoystickQuadrant initial) { mInitialQuadrant = initial; };
+
+ BOOL pointInCircle(S32 x, S32 y) const;
static std::string nameFromQuadrant(const EJoystickQuadrant quadrant);
static EJoystickQuadrant quadrantFromName(const std::string& name);