summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolbrush.h
diff options
context:
space:
mode:
authorTess Chu <tess@lindenlab.com>2007-07-11 21:29:02 +0000
committerTess Chu <tess@lindenlab.com>2007-07-11 21:29:02 +0000
commit57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch)
treef89014544fc276b283a36eb2e0cb52e93806a44a /indra/newview/lltoolbrush.h
parenta6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff)
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
Diffstat (limited to 'indra/newview/lltoolbrush.h')
-rw-r--r--indra/newview/lltoolbrush.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
index 3cae7559a3..81b2c61ef5 100644
--- a/indra/newview/lltoolbrush.h
+++ b/indra/newview/lltoolbrush.h
@@ -53,7 +53,7 @@ public:
virtual void undo();
virtual BOOL canUndo() { return TRUE; }
- virtual void redo();
+ //virtual void redo();
virtual BOOL canRedo() { return FALSE; }