From 750f94ca6931acc6ceb6dfd97c9200418326f28d Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 7 Oct 2009 00:15:11 +0000 Subject: [PATCH] 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/llcommon/llcursortypes.cpp | 6 ++---- indra/llcommon/llcursortypes.h | 6 ------ indra/llwindow/llwindowmacosx.cpp | 12 ------------ indra/llwindow/llwindowsdl.cpp | 4 ---- indra/llwindow/llwindowwin32.cpp | 4 ---- indra/newview/CMakeLists.txt | 4 ---- indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif | Bin 14776 -> 0 bytes .../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 install.xml | 14 +++++++------- 14 files changed, 13 insertions(+), 45 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 diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp index 7444115aa1..23ede97af3 100644 --- a/indra/llcommon/llcursortypes.cpp +++ b/indra/llcommon/llcursortypes.cpp @@ -30,6 +30,8 @@ * $/LicenseInfo$ */ +#include "linden_common.h" + #include "llcursortypes.h" ECursorType getCursorFromString(const std::string& cursor_string) @@ -66,10 +68,6 @@ ECursorType getCursorFromString(const std::string& cursor_string) cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN; cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN; cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3; - cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT; - cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY; - cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY; - cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN; cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY; cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE; cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN; diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h index bea70351b7..35dbeaf16e 100644 --- a/indra/llcommon/llcursortypes.h +++ b/indra/llcommon/llcursortypes.h @@ -33,8 +33,6 @@ #ifndef LL_LLCURSORTYPES_H #define LL_LLCURSORTYPES_H -#include "linden_common.h" - // If you add types here, add them in LLCursor::getCursorFromString enum ECursorType { UI_CURSOR_ARROW, @@ -66,10 +64,6 @@ enum ECursorType { UI_CURSOR_TOOLPAN, UI_CURSOR_TOOLZOOMIN, UI_CURSOR_TOOLPICKOBJECT3, - UI_CURSOR_TOOLSIT, - UI_CURSOR_TOOLBUY, - UI_CURSOR_TOOLPAY, - UI_CURSOR_TOOLOPEN, UI_CURSOR_TOOLPLAY, UI_CURSOR_TOOLPAUSE, UI_CURSOR_TOOLMEDIAOPEN, diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index d2760e3d59..7137c93476 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -2763,10 +2763,6 @@ const char* cursorIDToName(int id) case UI_CURSOR_TOOLPAN: return "UI_CURSOR_TOOLPAN"; case UI_CURSOR_TOOLZOOMIN: return "UI_CURSOR_TOOLZOOMIN"; case UI_CURSOR_TOOLPICKOBJECT3: return "UI_CURSOR_TOOLPICKOBJECT3"; - case UI_CURSOR_TOOLSIT: return "UI_CURSOR_TOOLSIT"; - case UI_CURSOR_TOOLBUY: return "UI_CURSOR_TOOLBUY"; - case UI_CURSOR_TOOLPAY: return "UI_CURSOR_TOOLPAY"; - case UI_CURSOR_TOOLOPEN: return "UI_CURSOR_TOOLOPEN"; case UI_CURSOR_TOOLPLAY: return "UI_CURSOR_TOOLPLAY"; case UI_CURSOR_TOOLPAUSE: return "UI_CURSOR_TOOLPAUSE"; case UI_CURSOR_TOOLMEDIAOPEN: return "UI_CURSOR_TOOLMEDIAOPEN"; @@ -2862,10 +2858,6 @@ void LLWindowMacOSX::setCursor(ECursorType cursor) case UI_CURSOR_TOOLPAN: case UI_CURSOR_TOOLZOOMIN: case UI_CURSOR_TOOLPICKOBJECT3: - case UI_CURSOR_TOOLSIT: - case UI_CURSOR_TOOLBUY: - case UI_CURSOR_TOOLPAY: - case UI_CURSOR_TOOLOPEN: case UI_CURSOR_TOOLPLAY: case UI_CURSOR_TOOLPAUSE: case UI_CURSOR_TOOLMEDIAOPEN: @@ -2907,10 +2899,6 @@ void LLWindowMacOSX::initCursors() initPixmapCursor(UI_CURSOR_TOOLPAN, 7, 6); initPixmapCursor(UI_CURSOR_TOOLZOOMIN, 7, 6); initPixmapCursor(UI_CURSOR_TOOLPICKOBJECT3, 1, 1); - initPixmapCursor(UI_CURSOR_TOOLSIT, 1, 1); - initPixmapCursor(UI_CURSOR_TOOLBUY, 1, 1); - initPixmapCursor(UI_CURSOR_TOOLPAY, 1, 1); - initPixmapCursor(UI_CURSOR_TOOLOPEN, 1, 1); initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1); initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1); initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index ecda880c1f..00a8d429ba 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -1981,10 +1981,6 @@ void LLWindowSDL::initCursors() mSDLCursors[UI_CURSOR_TOOLPAN] = makeSDLCursorFromBMP("lltoolpan.BMP",7,5); mSDLCursors[UI_CURSOR_TOOLZOOMIN] = makeSDLCursorFromBMP("lltoolzoomin.BMP",7,5); mSDLCursors[UI_CURSOR_TOOLPICKOBJECT3] = makeSDLCursorFromBMP("toolpickobject3.BMP",0,0); - mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit.BMP",0,0); - mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",0,0); - mSDLCursors[UI_CURSOR_TOOLPAY] = makeSDLCursorFromBMP("toolpay.BMP",0,0); - mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",0,0); mSDLCursors[UI_CURSOR_TOOLPLAY] = makeSDLCursorFromBMP("toolplay.BMP",0,0); mSDLCursors[UI_CURSOR_TOOLPAUSE] = makeSDLCursorFromBMP("toolpause.BMP",0,0); mSDLCursors[UI_CURSOR_TOOLMEDIAOPEN] = makeSDLCursorFromBMP("toolmediaopen.BMP",0,0); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 0faa3e93ff..c608c21d05 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1527,10 +1527,6 @@ void LLWindowWin32::initCursors() mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE")); // Color cursors - mCursor[UI_CURSOR_TOOLSIT] = loadColorCursor(TEXT("TOOLSIT")); - mCursor[UI_CURSOR_TOOLBUY] = loadColorCursor(TEXT("TOOLBUY")); - mCursor[UI_CURSOR_TOOLPAY] = loadColorCursor(TEXT("TOOLPAY")); - mCursor[UI_CURSOR_TOOLOPEN] = loadColorCursor(TEXT("TOOLOPEN")); mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY")); mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE")); mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN")); 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 39d89987aaa1677c04ae02ff908de03373fae363..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14776 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 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 864c8dee7aedbcfa459e49649c80eaabfe53294a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15144 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 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 d6d835a90bc790a75fa65bcacb7679152b6a592f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15176 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 DM3f_N 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 c61cd76bef11e11ae0a31c61c35b64b104996bd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmcJPze`*}5Xa}mBg!EpHdcZ^s#s4GD}%jYV=Za+Uob_$t85JfgzYSnkQ8bB3$98L zx7H?t!9tKgv^$76`OLi2JAd3=n!LN&eLLTsna`WOdm>MylDRpF>+^)jGE&hBsii~a3mNK3<(BrU4kRQkYFg( zGR9~jb?Oi6Xs>q%Dr#qTMXRZuVagQE6v!}TYG=eul1%MP?KqC8ji36N`kDHEM49@T z-eedu44FRovC)-ydOXaGevI^>P_MvN;3(9Kqje5?P~a%e!Gpzd6I5U+uoNH)1>+|G zOChkZso*HE@Wsf(nG{%x_aj*R*Wjms4+ew5U@#aA27@7fPB0W03}}H9l*mm!Jx6TnE&a~Fw*mKbUyjtBA>wX^J4;vlWV1Wv?y1ct zXVHh_p?$%%d`Azyo5F+iTL91gu>P$a)$i!uyIS_ZI=ojc?z()Q`BA;Q9c`HGvHzeC z-V))1Y#ZCF7AjN|aFll5#as1A?_pZAt;@my+CR zkw*d&kyI}|I*-ny^Qz1BmViE>59kB>fL`4q`iMTVi0C7F21)1>`h-5ANa!=`%sMB_ z?CCxEJ%Kzgyg9o)>dAv4piih?6OjmJHix68c7ggisX(MBS9j$Bf0H5 zEH`@cNAgGV>lH=vM`{ych%iLzpw~uK?DS|D>Gc|^K_Xv*Ey0noy^Nw6d!5((`UfFOZR^^zVpRaxWD8E8xxm zSg?2X{7Oe}{ugKC(f!;%=k8$N%vDt?qQg8IE!izX-IW7(b^$h{|c0&s>pQta57{aUU+~Z>{ z^+eN~UEg*!FE^sJb~P(ukEeK#+$u0Ob~D=vRNe0AwecHsujm)OQu~6QcbJ%(zcw$p zYo4OtZ|tqPDa>k912)}%0R)w^5lui_i`%wx0l~e|B=(d zK)(C=7YZ4MWjKbfwg%0h88j0#tz0a+MYre{-J*vuhwjiF8;9=DS;V7zbdT;4Ji4-1 z_UdD0!)&N;NMr~yq7ut985j%<1_lE|M1sM|JEF2aN3x|ax zwh9glgN4Du5L##9urOE{JhhZLwvam2hka~s=nhoWc6h~BQ`^DhDC#KSU~<%U7#&F* zwH>wNam3o_)OXZ()DK7GsPE{FgTcYz=tDR*x)Prrg_SuRBR%lc^RRh1JoVzy1`c}Q z;qZZj2aCr|kcY*?;(_oKjIRJJoJ7g+pWR;A7=W z`B8Rvccs_s$-%*a93CFZ$;pWv9UaNp*_oW5pUcI?gd~7b4CzR$V=6Zd?p=@N8b2<@o?@%_m4<6Z+ zyCrb(LTt#+%^?e(&hY*S_qqb!O%N!p!G_b^L~i3}mUo`rsvS*z6z@ma5X zhY-z`y-wkfHsfu{!o!BhPwWNHF-nN7GNZ-75MP#I7Y~q^m5V<-I*ruCB6ZC#_B^X(to*v61yzk+izKZYxQX zyZ8xny)2S;@37NtrFlH;3jW>$dljGOqxgGUxZ@2TUzL5l`+qCtUo*D!-R-^(hTrP- zhgJP>{i_ZK*LwT)Ky~q*>Ks0`Exp~?*WvShy%}!ZcI44;Ll%c?GI#Th)Sfq`wlR2R lz8JhTGrzxFmYG*I*^rvNU}(QK!>BRl7>oM)`cW*Z`X3<>YVrU8 diff --git a/install.xml b/install.xml index 6366b3104b..e7a7648345 100644 --- a/install.xml +++ b/install.xml @@ -48,7 +48,7 @@ copyright Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga description - The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client. + The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client. Packages also include cursors. license lgpl packages @@ -56,23 +56,23 @@ darwin md5sum - 7b07e7121a3623b2553ed36fb9024b40 + 40b8a63b553d91304588fba6796d7cc1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080818.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20091006.tar.bz2 linux md5sum - 25f8a8fc4ea94169fe6222571b8d5e55 + 298fd8a3351f6a8d757d205a1e9ad82f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20081222c.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20091006.tar.bz2 windows md5sum - 149626b0c10d7eb8b9f9be96b5318218 + 33bb17ecbef6cdadff533d97135f3a56 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20091006.tar.bz2