From 536a99c7aebdc42b26b150bee269edd2f430e289 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 26 Mar 2018 17:42:57 +0300 Subject: MAINT-8428 FIXED [OSX] The 'Eyedropper' cursor is not shown in the world --- indra/llwindow/llwindowmacosx.cpp | 2 ++ indra/newview/cursors_mac/UI_CURSOR_PIPETTE.tif | Bin 0 -> 326 bytes 2 files changed, 2 insertions(+) create mode 100644 indra/newview/cursors_mac/UI_CURSOR_PIPETTE.tif (limited to 'indra') diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 5f35a0f0f9..843294c239 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1515,6 +1515,7 @@ void LLWindowMacOSX::updateCursor() case UI_CURSOR_NOLOCKED: case UI_CURSOR_ARROWLOCKED: case UI_CURSOR_GRABLOCKED: + case UI_CURSOR_PIPETTE: case UI_CURSOR_TOOLTRANSLATE: case UI_CURSOR_TOOLROTATE: case UI_CURSOR_TOOLSCALE: @@ -1565,6 +1566,7 @@ void LLWindowMacOSX::initCursors() initPixmapCursor(UI_CURSOR_NOLOCKED, 8, 8); initPixmapCursor(UI_CURSOR_ARROWLOCKED, 1, 1); initPixmapCursor(UI_CURSOR_GRABLOCKED, 2, 14); + initPixmapCursor(UI_CURSOR_PIPETTE, 3, 29); initPixmapCursor(UI_CURSOR_TOOLTRANSLATE, 1, 1); initPixmapCursor(UI_CURSOR_TOOLROTATE, 1, 1); initPixmapCursor(UI_CURSOR_TOOLSCALE, 1, 1); diff --git a/indra/newview/cursors_mac/UI_CURSOR_PIPETTE.tif b/indra/newview/cursors_mac/UI_CURSOR_PIPETTE.tif new file mode 100644 index 0000000000..b4780967f9 Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_PIPETTE.tif differ -- cgit v1.2.3