summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
commit19fb0a16695b57e70dc371471d37c16929f1c424 (patch)
tree39f16d806b66e3795ded41c1462e205404996046 /indra/llui/llbutton.h
parent8e56f063924601041bac3791e794fa6934f20936 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
Manual merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r--indra/llui/llbutton.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 2d5fefa78c..d87ceb7c42 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -350,6 +350,7 @@ private:
BOOL mCommitOnReturn;
BOOL mFadeWhenDisabled;
bool mForcePressedState;
+ bool mMouseOver;
LLFrameTimer mFlashingTimer;
};