summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-04 17:03:34 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-04 17:03:34 -0500
commit938c51d2a483962556ee183c24e2b3f635f2c56b (patch)
tree962440abff0e5aa3dfa0fdf34b25f96780bcb3be /indra/newview/llfolderview.h
parent01f61d4d9e7763cbbf9e21673cb23f71a792e9c4 (diff)
parentfa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (diff)
merge to pull viewer-2 changes into avp
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r--indra/newview/llfolderview.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 8e9dd923a0..4adf6c2fbf 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -227,7 +227,6 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
- virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
virtual void draw();
virtual void deleteAllChildren();