diff options
author | Armin Weatherwax | 2009-06-08 11:10:27 +0200 |
---|---|---|
committer | McCabe Maxsted | 2009-09-04 11:34:24 -0700 |
commit | 3f0082a9dda60432b8b759e09f19b495d9d5275c (patch) | |
tree | 989f5e10f9b9891ec7718b5ee2406582b6c0e352 /linden/indra/newview/lltool.cpp | |
parent | Rebranded startup loading page to Imprudence (diff) | |
download | meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.zip meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.gz meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.bz2 meta-impy-3f0082a9dda60432b8b759e09f19b495d9d5275c.tar.xz |
Linux middle mouse button paste/primary selection support and gtk clipboard handler (fixes crashbug using synergy mouse-keyboard-clipboard-sharing over lan)
modified: linden/doc/contributions.txt
modified: linden/indra/llui/llclipboard.cpp
modified: linden/indra/llui/llclipboard.h
modified: linden/indra/llui/llfloater.cpp
modified: linden/indra/llui/llfloater.h
modified: linden/indra/llui/lllineeditor.cpp
modified: linden/indra/llui/lllineeditor.h
modified: linden/indra/llui/lltexteditor.cpp
modified: linden/indra/llui/lltexteditor.h
modified: linden/indra/llui/llview.cpp
modified: linden/indra/llui/llview.h
modified: linden/indra/llwindow/CMakeLists.txt
new file: linden/indra/llwindow/llmousehandler.cpp
modified: linden/indra/llwindow/llmousehandler.h
modified: linden/indra/llwindow/llwindow.cpp
modified: linden/indra/llwindow/llwindow.h
modified: linden/indra/llwindow/llwindowsdl.cpp
modified: linden/indra/llwindow/llwindowsdl.h
modified: linden/indra/newview/lltool.cpp
modified: linden/indra/newview/lltool.h
modified: linden/indra/newview/llviewertexteditor.cpp
modified: linden/indra/newview/llviewertexteditor.h
modified: linden/indra/newview/llviewerwindow.cpp
modified: linden/indra/newview/llviewerwindow.h
(cherry picked from commit 594f4830922f4294dda432fa748935adffaeed8f)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltool.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp index 99dbe31..9dfd86b 100644 --- a/linden/indra/newview/lltool.cpp +++ b/linden/indra/newview/lltool.cpp | |||
@@ -64,7 +64,6 @@ LLTool::~LLTool() | |||
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | |||
68 | BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask) | 67 | BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask) |
69 | { | 68 | { |
70 | if (gDebugClicks) | 69 | if (gDebugClicks) |
@@ -124,6 +123,20 @@ BOOL LLTool::handleRightMouseUp(S32 x, S32 y, MASK mask) | |||
124 | // llinfos << "LLTool::handleRightMouseDown" << llendl; | 123 | // llinfos << "LLTool::handleRightMouseDown" << llendl; |
125 | return FALSE; | 124 | return FALSE; |
126 | } | 125 | } |
126 | |||
127 | BOOL LLTool::handleMiddleMouseDown(S32 x,S32 y,MASK mask) | ||
128 | { | ||
129 | // by default, didn't handle it | ||
130 | // llinfos << "LLTool::handleMiddleMouseDown" << llendl; | ||
131 | return FALSE; | ||
132 | } | ||
133 | |||
134 | BOOL LLTool::handleMiddleMouseUp(S32 x, S32 y, MASK mask) | ||
135 | { | ||
136 | // by default, didn't handle it | ||
137 | // llinfos << "LLTool::handleMiddleMouseUp" << llendl; | ||
138 | return FALSE; | ||
139 | } | ||
127 | 140 | ||
128 | BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) | 141 | BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) |
129 | { | 142 | { |