1 files changed, 16 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
index b16d0ffce8..6bbeb796d3 100644
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -179,11 +179,26 @@ bool LLWindowCallbacks::handlePaint(LLWindow *window, const S32 x, const S32 y,
     return false;
 }
 
-bool LLWindowCallbacks::handleDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)
+bool LLWindowCallbacks::handleLeftMouseDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)
 {
     return false;
 }
 
+bool LLWindowCallbacks::handleRightMouseDoubleClick(LLWindow* window, const LLCoordGL pos, MASK mask)
+{
+    // Fallback to right mouse events for double click in case
+    // some platforms don't support or implement double click events
+    handleMouseMove(window, pos, mask);
+    return handleRightMouseDown(window, pos, mask);
+}
+
+bool LLWindowCallbacks::handleMiddleMouseDoubleClick(LLWindow* window, const LLCoordGL pos, MASK mask)
+{
+    // Fallback to middle mouse events for double click in case
+    // some platforms don't support or implement double click events
+    return handleMiddleMouseDown(window, pos, mask);
+}
+
 void LLWindowCallbacks::handleWindowBlock(LLWindow *window)
 {
 }