summaryrefslogtreecommitdiff
path: root/indra/newview/lltool.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-02-19 21:42:32 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-02-19 21:42:32 +0000
commit2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch)
tree8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/lltool.h
parentdb0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff)
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/lltool.h')
-rw-r--r--indra/newview/lltool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h
index 33dc4785c6..7d565f1574 100644
--- a/indra/newview/lltool.h
+++ b/indra/newview/lltool.h
@@ -51,7 +51,7 @@ public:
virtual ~LLTool();
// Hack to support LLFocusMgr
- virtual BOOL isView() { return FALSE; }
+ virtual BOOL isView() const { return FALSE; }
// Virtual functions inherited from LLMouseHandler
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);