diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/indra/llui/llfloater.h | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/indra/llui/llfloater.h')
| -rw-r--r-- | linden/indra/llui/llfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h index a6fe3cc..37081c2 100644 --- a/linden/indra/llui/llfloater.h +++ b/linden/indra/llui/llfloater.h | |||
| @@ -178,7 +178,7 @@ public: | |||
| 178 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 178 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
| 179 | virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); | 179 | virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); |
| 180 | virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); | 180 | virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); |
| 181 | 181 | virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask); | |
| 182 | virtual void draw(); | 182 | virtual void draw(); |
| 183 | 183 | ||
| 184 | virtual void onOpen() {} | 184 | virtual void onOpen() {} |