From 750f94ca6931acc6ceb6dfd97c9200418326f28d Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 7 Oct 2009 00:15:11 +0000 Subject: EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly. --- indra/newview/CMakeLists.txt | 4 ---- indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif | Bin 14776 -> 0 bytes indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif | Bin 15144 -> 0 bytes indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif | Bin 15176 -> 0 bytes indra/newview/lltoolpie.cpp | 8 ++++---- indra/newview/res/toolbuy.cur | Bin 2238 -> 0 bytes indra/newview/res/toolopen.cur | Bin 2238 -> 0 bytes indra/newview/res/toolsit.cur | Bin 2238 -> 0 bytes 8 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif delete mode 100644 indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif delete mode 100644 indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif delete mode 100644 indra/newview/res/toolbuy.cur delete mode 100644 indra/newview/res/toolopen.cur delete mode 100644 indra/newview/res/toolsit.cur (limited to 'indra/newview') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 747eb5d19b..87c31c600e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1103,14 +1103,10 @@ if (WINDOWS) res/ll_icon.BMP res/ll_icon.ico res/resource.h - res/toolbuy.cur - res/toolopen.cur - res/toolpay.cur res/toolpickobject.cur res/toolpickobject2.cur res/toolpickobject3.cur res/toolpipette.cur - res/toolsit.cur ) set_source_files_properties(${viewer_RESOURCE_FILES} diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif deleted file mode 100644 index 39d89987aa..0000000000 Binary files a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif and /dev/null differ diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif deleted file mode 100644 index 864c8dee7a..0000000000 Binary files a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif and /dev/null differ diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif deleted file mode 100644 index d6d835a90b..0000000000 Binary files a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif and /dev/null differ diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index aa55d54dbb..beb16c267e 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -392,24 +392,24 @@ ECursorType cursor_from_object(LLViewerObject* object) case CLICK_ACTION_SIT: if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // not already sitting? { - cursor = UI_CURSOR_TOOLSIT; + cursor = UI_CURSOR_HAND; } break; case CLICK_ACTION_BUY: - cursor = UI_CURSOR_TOOLBUY; + cursor = UI_CURSOR_HAND; break; case CLICK_ACTION_OPEN: // Open always opens the parent. if (parent && parent->allowOpen()) { - cursor = UI_CURSOR_TOOLOPEN; + cursor = UI_CURSOR_HAND; } break; case CLICK_ACTION_PAY: if ((object && object->flagTakesMoney()) || (parent && parent->flagTakesMoney())) { - cursor = UI_CURSOR_TOOLPAY; + cursor = UI_CURSOR_HAND; } break; case CLICK_ACTION_PLAY: diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur deleted file mode 100644 index c61cd76bef..0000000000 Binary files a/indra/newview/res/toolbuy.cur and /dev/null differ diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur deleted file mode 100644 index 8408f7c7eb..0000000000 Binary files a/indra/newview/res/toolopen.cur and /dev/null differ diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur deleted file mode 100644 index 60b0e773e5..0000000000 Binary files a/indra/newview/res/toolsit.cur and /dev/null differ -- cgit v1.2.3