diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llwindow/llwindowmacosx.cpp | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 4152de51c5..62743d4d08 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -2157,6 +2157,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e case kEventMouseButtonSecondary: mCallbacks->handleRightMouseDown(this, outCoords, mask); break; + + case kEventMouseButtonTertiary: + mCallbacks->handleMiddleMouseDown(this, outCoords, mask); + break; } result = noErr; break; @@ -2179,6 +2183,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e case kEventMouseButtonSecondary: mCallbacks->handleRightMouseUp(this, outCoords, mask); break; + + case kEventMouseButtonTertiary: + mCallbacks->handleMiddleMouseUp(this, outCoords, mask); + break; } result = noErr; break; |