diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/llui/lllineeditor.h | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/llui/lllineeditor.h')
| -rw-r--r-- | linden/indra/llui/lllineeditor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h index f9e0621..d217859 100644 --- a/linden/indra/llui/lllineeditor.h +++ b/linden/indra/llui/lllineeditor.h | |||
| @@ -90,6 +90,7 @@ public: | |||
| 90 | /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 90 | /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
| 91 | /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 91 | /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
| 92 | /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); | 92 | /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); |
| 93 | /*virtual*/ BOOL handleHScrollWheel(S32 x, S32 y, S32 clicks); | ||
| 93 | /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask); | 94 | /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask); |
| 94 | /*virtual*/ BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask); | 95 | /*virtual*/ BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask); |
| 95 | /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); | 96 | /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); |