diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp index e987c397bd..2db209a02d 100644 --- 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; } diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h index bacb0a80ba..d675c2e882 100644 --- 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_COUNT // Number of elements in this enum (NOT a cursor) }; diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 072f694c24..f71b49c12d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -338,7 +338,8 @@ LLWindow* LLWindowManager::createWindow( BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, - U32 fsaa_samples) + U32 fsaa_samples, + BOOL use_legacy_cursors) { LLWindow* new_window; @@ -351,15 +352,15 @@ LLWindow* LLWindowManager::createWindow( #elif LL_SDL new_window = new LLWindowSDL(callbacks, title, x, y, width, height, flags, - fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); + fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, use_legacy_cursors); #elif LL_WINDOWS new_window = new LLWindowWin32(callbacks, title, name, x, y, width, height, flags, - fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); + fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, use_legacy_cursors); #elif LL_DARWIN new_window = new LLWindowMacOSX(callbacks, title, name, x, y, width, height, flags, - fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); + fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, use_legacy_cursors); #endif } else diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index e8a86a1880..c681a38182 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -258,7 +258,8 @@ public: BOOL disable_vsync = TRUE, BOOL use_gl = TRUE, BOOL ignore_pixel_depth = FALSE, - U32 fsaa_samples = 0); + U32 fsaa_samples = 0, + BOOL use_legacy_cursors = TRUE); static BOOL destroyWindow(LLWindow* window); static BOOL isWindowValid(LLWindow *window); }; diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 44c0913c98..8ee2c86336 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -217,7 +217,8 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, - U32 fsaa_samples) + U32 fsaa_samples, + BOOL use_legacy_cursors) : LLWindow(NULL, fullscreen, flags) { // *HACK: During window construction we get lots of OS events for window @@ -319,7 +320,7 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks, } //start with arrow cursor - initCursors(); + initCursors(use_legacy_cursors); setCursor( UI_CURSOR_ARROW ); } @@ -2739,7 +2740,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e return result; } -const char* cursorIDToName(int id) +const char* cursorIDToName(int id, BOOL use_legacy_cursors) { switch (id) { @@ -2776,9 +2777,10 @@ 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_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; @@ -2789,14 +2791,14 @@ const char* cursorIDToName(int id) static CursorRef gCursors[UI_CURSOR_COUNT]; -static void initPixmapCursor(int cursorid, int hotspotX, int hotspotY) +static void initPixmapCursor(int cursorid, int hotspotX, int hotspotY, BOOL use_legacy_cursors = TRUE) { // cursors are in /Contents/Resources/cursors_mac/UI_CURSOR_FOO.tif std::string fullpath = gDirUtilp->getAppRODataDir(); fullpath += gDirUtilp->getDirDelimiter(); fullpath += "cursors_mac"; fullpath += gDirUtilp->getDirDelimiter(); - fullpath += cursorIDToName(cursorid); + fullpath += cursorIDToName(cursorid, use_legacy_cursors); fullpath += ".tif"; gCursors[cursorid] = createImageCursor(fullpath.c_str(), hotspotX, hotspotY); @@ -2883,6 +2885,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor) case UI_CURSOR_TOOLMEDIAOPEN: case UI_CURSOR_TOOLSIT: case UI_CURSOR_TOOLBUY: + case UI_CURSOR_TOOLPAY: case UI_CURSOR_TOOLOPEN: result = setImageCursor(gCursors[cursor]); break; @@ -2902,7 +2905,8 @@ ECursorType LLWindowMacOSX::getCursor() const return mCurrentCursor; } -void LLWindowMacOSX::initCursors() +void LLWindowMacOSX::initCursors(BOOL use_legacy_cursors) +{ { initPixmapCursor(UI_CURSOR_NO, 8, 8); initPixmapCursor(UI_CURSOR_WORKING, 1, 1); @@ -2925,9 +2929,10 @@ void LLWindowMacOSX::initCursors() initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1); initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1); initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1); - initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15); - initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15); - initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15); + initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15, use_legacy_cursors); + initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15, use_legacy_cursors); + initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15, use_legacy_cursors); + initPixmapCursor(UI_CURSOR_TOOLPAY, 20, 15, use_legacy_cursors); initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10); initPixmapCursor(UI_CURSOR_SIZENESW, 10, 10); diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 6dc093b4be..336d08234e 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -123,10 +123,11 @@ protected: const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, - U32 fsaa_samples); + U32 fsaa_samples, + BOOL use_legacy_cursors); ~LLWindowMacOSX(); - void initCursors(); + void initCursors(BOOL use_legacy_cursors = TRUE); BOOL isValid(); void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 5bfa437fc8..00adfd0ae7 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -187,7 +187,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks, S32 height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, - BOOL ignore_pixel_depth, U32 fsaa_samples) + BOOL ignore_pixel_depth, U32 fsaa_samples, BOOL use_legacy_cursors) : LLWindow(callbacks, fullscreen, flags), Lock_Display(NULL), Unlock_Display(NULL), mGamma(1.0f) @@ -233,7 +233,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks, gGLManager.initGL(); //start with arrow cursor - initCursors(); + initCursors(use_legacy_cursors); setCursor( UI_CURSOR_ARROW ); } @@ -2023,7 +2023,7 @@ void LLWindowSDL::setCursor(ECursorType cursor) } } -void LLWindowSDL::initCursors() +void LLWindowSDL::initCursors(BOOL use_legacy_cursors) { int i; // Blank the cursor pointer array for those we may miss. @@ -2068,9 +2068,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 (use_legacy_cursors) { + 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); + } if (getenv("LL_ATI_MOUSE_CURSOR_BUG") != NULL) { llinfos << "Disabling cursor updating due to LL_ATI_MOUSE_CURSOR_BUG" << llendl; diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index fa544b16ce..2f777cb831 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -146,13 +146,14 @@ protected: LLWindowSDL(LLWindowCallbacks* callbacks, const std::string& title, int x, int y, int width, int height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, - BOOL ignore_pixel_depth, U32 fsaa_samples); + BOOL ignore_pixel_depth, U32 fsaa_samples, BOOL use_legacy_cursors); + BOOL ignore_pixel_depth, U32 fsaa_samples, BOOL use_legacy_cursors); ~LLWindowSDL(); /*virtual*/ BOOL isValid(); /*virtual*/ LLSD getNativeKeyData(); - void initCursors(); + void initCursors(BOOL use_legacy_cursors = TRUE); void quitCursors(); void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size); diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 87075c7318..ed46226b47 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -363,7 +363,8 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, - U32 fsaa_samples) + U32 fsaa_samples, + BOOL use_legacy_cursors) : LLWindow(callbacks, fullscreen, flags) { mFSAASamples = fsaa_samples; @@ -612,7 +613,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks, } //start with arrow cursor - initCursors(); + initCursors(use_legacy_cursors); setCursor( UI_CURSOR_ARROW ); // Initialize (boot strap) the Language text input management, @@ -1504,7 +1505,7 @@ HCURSOR LLWindowWin32::loadColorCursor(LPCTSTR name) } -void LLWindowWin32::initCursors() +void LLWindowWin32::initCursors(BOOL use_legacy_cursors) { mCursor[ UI_CURSOR_ARROW ] = LoadCursor(NULL, IDC_ARROW); mCursor[ UI_CURSOR_WAIT ] = LoadCursor(NULL, IDC_WAIT); @@ -1538,9 +1539,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 (use_legacy_cursors) + { + 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")); + } // Color cursors mCursor[ UI_CURSOR_TOOLPLAY ] = loadColorCursor(TEXT("TOOLPLAY")); diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 387e4cbdb6..2011894a7a 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -118,10 +118,10 @@ protected: LLWindowWin32(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, - BOOL ignore_pixel_depth, U32 fsaa_samples); + BOOL ignore_pixel_depth, U32 fsaa_samples, BOOL use_legacy_cursors); ~LLWindowWin32(); - void initCursors(); + void initCursors(BOOL use_legacy_cursors = TRUE); void initInputDevices(); HCURSOR loadColorCursor(LPCTSTR name); BOOL isValid(); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8d59a90d39..db84782c7d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12842,5 +12842,16 @@ Value 1 + UseLegacyCursors + + Comment + Use 1.x style cursors instead + Persist + 1 + Type + Boolean + Value + 1 + 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 71ce6d7464..83a375b8f3 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -450,7 +450,7 @@ ECursorType cursor_from_object(LLViewerObject* object) if ((object && object->flagTakesMoney()) || (parent && parent->flagTakesMoney())) { - cursor = UI_CURSOR_TOOLBUY; + cursor = UI_CURSOR_TOOLPAY; } break; case CLICK_ACTION_ZOOM: diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 75111b7a79..ca788833e1 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1358,7 +1358,8 @@ LLViewerWindow::LLViewerWindow( gSavedSettings.getBOOL("DisableVerticalSync"), !gNoRender, ignore_pixel_depth, - gSavedSettings.getBOOL("RenderUseFBO") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled + gSavedSettings.getBOOL("RenderUseFBO") ? 0 : gSavedSettings.getU32("RenderFSAASamples"), //don't use window level anti-aliasing if FBOs are enabled + gSavedSettings.getBOOL("UseLegacyCursors")); if (!LLAppViewer::instance()->restoreErrorTrap()) { 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/res/viewerRes.rc.in b/indra/newview/res/viewerRes.rc.in index fe6ae14711..8d5b9239e0 100644 --- a/indra/newview/res/viewerRes.rc.in +++ b/indra/newview/res/viewerRes.rc.in @@ -135,6 +135,11 @@ TOOLBUY CURSOR "toolbuy.cur" TOOLOPEN CURSOR "toolopen.cur" TOOLSIT CURSOR "toolsit.cur" +TOOLBUY-LEGACY CURSOR "toolbuy-legacy.cur" +TOOLPAY-LEGACY CURSOR "toolpay-legacy.cur" +TOOLOPEN-LEGACY CURSOR "toolopen-legacy.cur" +TOOLSIT-LEGACY CURSOR "toolsit-legacy.cur" + ///////////////////////////////////////////////////////////////////////////// // // Version 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 189e694c90..eb92c18b0f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml @@ -78,5 +78,30 @@ width="200"> (Requires restart) + + + + (Requires restart) +