diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp index ec60097195..bbf58d59bd 100755 --- a/indra/llcommon/llcursortypes.cpp +++ b/indra/llcommon/llcursortypes.cpp @@ -68,6 +68,7 @@ ECursorType getCursorFromString(const std::string& cursor_string) cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE; 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_TOOLPATHFINDING"] = UI_CURSOR_TOOLPATHFINDING; cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHSTART"] = UI_CURSOR_TOOLPATHFINDING_PATH_START; diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h index cb6d6636a0..0e9a3996b5 100755 --- a/indra/llcommon/llcursortypes.h +++ b/indra/llcommon/llcursortypes.h @@ -64,6 +64,7 @@ enum ECursorType { UI_CURSOR_PIPETTE, UI_CURSOR_TOOLSIT, UI_CURSOR_TOOLBUY, + UI_CURSOR_TOOLPAY, UI_CURSOR_TOOLOPEN, UI_CURSOR_TOOLPATHFINDING, UI_CURSOR_TOOLPATHFINDING_PATH_START, diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 40dcf1c662..2984c6b7e7 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -37,6 +37,7 @@ #include "llstring.h" #include "lldir.h" #include "indra_constants.h" +#include "../newview/llviewercontrol.h" #include #include @@ -1320,6 +1321,7 @@ void LLWindowMacOSX::setupFailure(const std::string& text, const std::string& ca // it is handled at a very low-level const char* cursorIDToName(int id) { + BOOL use_legacy_cursors = gSavedSettings.getBOOL("UseLegacyCursors"); switch (id) { case UI_CURSOR_ARROW: return "UI_CURSOR_ARROW"; @@ -1355,15 +1357,16 @@ const char* cursorIDToName(int id) case UI_CURSOR_TOOLPAUSE: return "UI_CURSOR_TOOLPAUSE"; case UI_CURSOR_TOOLMEDIAOPEN: return "UI_CURSOR_TOOLMEDIAOPEN"; case UI_CURSOR_PIPETTE: return "UI_CURSOR_PIPETTE"; - case UI_CURSOR_TOOLSIT: return "UI_CURSOR_TOOLSIT"; - case UI_CURSOR_TOOLBUY: return "UI_CURSOR_TOOLBUY"; - case UI_CURSOR_TOOLOPEN: return "UI_CURSOR_TOOLOPEN"; case UI_CURSOR_TOOLPATHFINDING: return "UI_CURSOR_PATHFINDING"; case UI_CURSOR_TOOLPATHFINDING_PATH_START: return "UI_CURSOR_PATHFINDING_START"; case UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD: return "UI_CURSOR_PATHFINDING_START_ADD"; case UI_CURSOR_TOOLPATHFINDING_PATH_END: return "UI_CURSOR_PATHFINDING_END"; case UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD: return "UI_CURSOR_PATHFINDING_END_ADD"; case UI_CURSOR_TOOLNO: return "UI_CURSOR_NO"; + case UI_CURSOR_TOOLSIT: if (use_legacy_cursors) return "UI_CURSOR_TOOLSIT_LEGACY"; else return "UI_CURSOR_TOOLSIT"; + case UI_CURSOR_TOOLBUY: if (use_legacy_cursors) return "UI_CURSOR_TOOLBUY_LEGACY"; else return "UI_CURSOR_TOOLBUY"; + case UI_CURSOR_TOOLOPEN: if (use_legacy_cursors) return "UI_CURSOR_TOOLOPEN_LEGACY"; else return "UI_CURSOR_TOOLOPEN"; + case UI_CURSOR_TOOLPAY: if (use_legacy_cursors) return "UI_CURSOR_TOOLBUY_LEGACY"; else return "UI_CURSOR_TOOLPAY"; } llerrs << "cursorIDToName: unknown cursor id" << id << llendl; @@ -1468,6 +1471,7 @@ void LLWindowMacOSX::updateCursor() case UI_CURSOR_TOOLMEDIAOPEN: case UI_CURSOR_TOOLSIT: case UI_CURSOR_TOOLBUY: + case UI_CURSOR_TOOLPAY: case UI_CURSOR_TOOLOPEN: case UI_CURSOR_TOOLPATHFINDING: case UI_CURSOR_TOOLPATHFINDING_PATH_START: @@ -1519,6 +1523,7 @@ void LLWindowMacOSX::initCursors() initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15); initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15); initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15); + initPixmapCursor(UI_CURSOR_TOOLPAY, 20, 15); initPixmapCursor(UI_CURSOR_TOOLPATHFINDING, 16, 16); initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START, 16, 16); initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD, 16, 16); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 73e145c840..c3c065e81d 100755 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -39,6 +39,7 @@ #include "llstring.h" #include "lldir.h" #include "llfindlocale.h" +#include "../newview/llviewercontrol.h" #if LL_GTK extern "C" { @@ -2160,9 +2161,19 @@ void LLWindowSDL::initCursors() mSDLCursors[UI_CURSOR_TOOLPAUSE] = makeSDLCursorFromBMP("toolpause.BMP",0,0); mSDLCursors[UI_CURSOR_TOOLMEDIAOPEN] = makeSDLCursorFromBMP("toolmediaopen.BMP",0,0); mSDLCursors[UI_CURSOR_PIPETTE] = makeSDLCursorFromBMP("lltoolpipette.BMP",2,28); - mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit.BMP",20,15); - mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",20,15); - mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",20,15); + if (gSavedSettings.getBOOL("UseLegacyCursors")) { + mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit-legacy.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy-legacy.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen-legacy.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLPAY] = makeSDLCursorFromBMP("toolpay-legacy.BMP",20,15); + } + else + { + mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",20,15); + mSDLCursors[UI_CURSOR_TOOLPAY] = makeSDLCursorFromBMP("toolbuy.BMP",20,15); + } mSDLCursors[UI_CURSOR_TOOLPATHFINDING] = makeSDLCursorFromBMP("lltoolpathfinding.BMP", 16, 16); mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_START] = makeSDLCursorFromBMP("lltoolpathfindingpathstart.BMP", 16, 16); mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD] = makeSDLCursorFromBMP("lltoolpathfindingpathstartadd.BMP", 16, 16); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 710bed0c4e..bd83d80210 100755 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -42,6 +42,7 @@ #include "llstring.h" #include "lldir.h" #include "llglslshader.h" +#include "../newview/llviewercontrol.h" // System includes #include @@ -1699,9 +1700,20 @@ void LLWindowWin32::initCursors() mCursor[ UI_CURSOR_TOOLZOOMIN ] = LoadCursor(module, TEXT("TOOLZOOMIN")); mCursor[ UI_CURSOR_TOOLPICKOBJECT3 ] = LoadCursor(module, TEXT("TOOLPICKOBJECT3")); mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE")); - mCursor[ UI_CURSOR_TOOLSIT ] = LoadCursor(module, TEXT("TOOLSIT")); - mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY")); - mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN")); + if (gSavedSettings.getBOOL("UseLegacyCursors")) + { + mCursor[ UI_CURSOR_TOOLSIT ] = LoadCursor(module, TEXT("TOOLSIT-LEGACY")); + mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY-LEGACY")); + mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN-LEGACY")); + mCursor[ UI_CURSOR_TOOLPAY ] = LoadCursor(module, TEXT("TOOLPAY-LEGACY")); + } + else + { + mCursor[ UI_CURSOR_TOOLSIT ] = LoadCursor(module, TEXT("TOOLSIT")); + mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY")); + mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN")); + mCursor[ UI_CURSOR_TOOLPAY ] = LoadCursor(module, TEXT("TOOLBUY")); + } mCursor[ UI_CURSOR_TOOLPATHFINDING ] = LoadCursor(module, TEXT("TOOLPATHFINDING")); mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHSTARTADD")); mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_START ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHSTART")); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2caa6a4784..f3ad2fb4dd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -17713,6 +17713,17 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 + UseLegacyCursors + + Comment + Use 1.x style cursors instead + Persist + 1 + Type + Boolean + Value + 0 + FSDisableLoginScreens Comment diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY_LEGACY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY_LEGACY.tif new file mode 100644 index 0000000000..39d89987aa Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY_LEGACY.tif differ diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN_LEGACY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN_LEGACY.tif new file mode 100644 index 0000000000..864c8dee7a Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN_LEGACY.tif differ diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY_LEGACY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY_LEGACY.tif new file mode 100644 index 0000000000..2bbb3b31ca Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY_LEGACY.tif differ diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT_LEGACY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT_LEGACY.tif new file mode 100644 index 0000000000..d6d835a90b Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT_LEGACY.tif differ diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 1c906483b9..582bdc16c9 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -496,7 +496,8 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object) if ((object && object->flagTakesMoney()) || (parent && parent->flagTakesMoney())) { - cursor = UI_CURSOR_TOOLBUY; + //cursor = UI_CURSOR_TOOLBUY; FIRESTORM - pay cursor is separate from buy cursor + cursor = UI_CURSOR_TOOLPAY; } } break; diff --git a/indra/newview/res-sdl/toolbuy-legacy.BMP b/indra/newview/res-sdl/toolbuy-legacy.BMP new file mode 100644 index 0000000000..a00bdb2c58 Binary files /dev/null and b/indra/newview/res-sdl/toolbuy-legacy.BMP differ diff --git a/indra/newview/res-sdl/toolopen-legacy.BMP b/indra/newview/res-sdl/toolopen-legacy.BMP new file mode 100644 index 0000000000..93c7e44b28 Binary files /dev/null and b/indra/newview/res-sdl/toolopen-legacy.BMP differ diff --git a/indra/newview/res-sdl/toolpay-legacy.BMP b/indra/newview/res-sdl/toolpay-legacy.BMP new file mode 100644 index 0000000000..819b6209f6 Binary files /dev/null and b/indra/newview/res-sdl/toolpay-legacy.BMP differ diff --git a/indra/newview/res-sdl/toolsit-legacy.BMP b/indra/newview/res-sdl/toolsit-legacy.BMP new file mode 100644 index 0000000000..ca911ece71 Binary files /dev/null and b/indra/newview/res-sdl/toolsit-legacy.BMP differ diff --git a/indra/newview/res/toolbuy-legacy.cur b/indra/newview/res/toolbuy-legacy.cur new file mode 100644 index 0000000000..c61cd76bef Binary files /dev/null and b/indra/newview/res/toolbuy-legacy.cur differ diff --git a/indra/newview/res/toolopen-legacy.cur b/indra/newview/res/toolopen-legacy.cur new file mode 100644 index 0000000000..8408f7c7eb Binary files /dev/null and b/indra/newview/res/toolopen-legacy.cur differ diff --git a/indra/newview/res/toolpay-legacy.cur b/indra/newview/res/toolpay-legacy.cur new file mode 100644 index 0000000000..93940e9c86 Binary files /dev/null and b/indra/newview/res/toolpay-legacy.cur differ diff --git a/indra/newview/res/toolsit-legacy.cur b/indra/newview/res/toolsit-legacy.cur new file mode 100644 index 0000000000..60b0e773e5 Binary files /dev/null and b/indra/newview/res/toolsit-legacy.cur differ diff --git a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml index e27b4a8ee9..066c39b0e0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml @@ -91,4 +91,36 @@ top_pad="20" name="reset_toolbar_settings" width="200" /> + + + + + + + +