diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
commit | dc6ce7f7826592c37810efa686f64ec2cf8a15ee (patch) | |
tree | e770ee51180e855c7da7d4b98fc631d0a06e95bc /indra/newview/llfolderview.h | |
parent | 6eee48e16e75c1f70bb1cbce9544bad63d9621cf (diff) | |
parent | fefb08eef53da3cb0204d31f349aabfa6369f10b (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index a0e252ae88..eaaba8c13d 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -230,7 +230,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(); |