diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif | bin | 14776 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif | bin | 15144 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif | bin | 15176 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/res/toolbuy.cur | bin | 2238 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/res/toolopen.cur | bin | 2238 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/res/toolsit.cur | bin | 2238 -> 0 bytes |
8 files changed, 4 insertions, 8 deletions
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 Binary files differdeleted file mode 100644 index 39d89987aa..0000000000 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif +++ /dev/null diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif Binary files differdeleted file mode 100644 index 864c8dee7a..0000000000 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif +++ /dev/null diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif Binary files differdeleted file mode 100644 index d6d835a90b..0000000000 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif +++ /dev/null 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 Binary files differdeleted file mode 100644 index c61cd76bef..0000000000 --- a/indra/newview/res/toolbuy.cur +++ /dev/null diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur Binary files differdeleted file mode 100644 index 8408f7c7eb..0000000000 --- a/indra/newview/res/toolopen.cur +++ /dev/null diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur Binary files differdeleted file mode 100644 index 60b0e773e5..0000000000 --- a/indra/newview/res/toolsit.cur +++ /dev/null |