livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in legacy cursors code to hopefully fix them on all platforms and make them work the same across platforms

Liny 2014-05-19 16:59:50 -07:00
parent 2a64a58daf 2301c4f312
commit c26a9a7e4b
32 changed files with 188 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llcursortypes.cpp
View File

@ -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; // <FS:LO> Legacy cursor setting from main program
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;

1
indra/llcommon/llcursortypes.h
View File

@ -64,6 +64,7 @@ enum ECursorType {
UI_CURSOR_PIPETTE,
UI_CURSOR_TOOLSIT,
UI_CURSOR_TOOLBUY,
UI_CURSOR_TOOLPAY, // <FS:LO> Legacy cursor setting from main program
UI_CURSOR_TOOLOPEN,
UI_CURSOR_TOOLPATHFINDING,
UI_CURSOR_TOOLPATHFINDING_PATH_START,

13
indra/llwindow/llwindow.cpp
View File

@ -398,7 +398,9 @@ LLWindow* LLWindowManager::createWindow(
BOOL disable_vsync,
BOOL use_gl,
BOOL ignore_pixel_depth,
U32 fsaa_samples)
//U32 fsaa_samples)
U32 fsaa_samples,
BOOL useLegacyCursors) // <FS:LO> Legacy cursor setting from main program
{
LLWindow* new_window;
@ -411,15 +413,18 @@ 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);
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
#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);
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
#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);
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples, useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
#endif
}
else

4
indra/llwindow/llwindow.h
View File

@ -279,7 +279,9 @@ public:
BOOL disable_vsync = TRUE,
BOOL use_gl = TRUE,
BOOL ignore_pixel_depth = FALSE,
U32 fsaa_samples = 0);
//U32 fsaa_samples = 0);
U32 fsaa_samples = 0,
BOOL useLegacyCursors = FALSE); // <FS:LO> Legacy cursor setting from main program
static BOOL destroyWindow(LLWindow* window);
static BOOL isWindowValid(LLWindow *window);
};

40
indra/llwindow/llwindowmacosx.cpp
View File

@ -117,8 +117,10 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
U32 fsaa_samples)
: LLWindow(NULL, fullscreen, flags)
/*U32 fsaa_samples,) // <FS:LO> Legacy cursor setting from main program
: LLWindow(NULL, fullscreen, flags)*/
U32 fsaa_samples, BOOL useLegacyCursors)
: LLWindow(NULL, fullscreen, flags), mUseLegacyCursors(useLegacyCursors)
{
// *HACK: During window construction we get lots of OS events for window
// reshape, activate, etc. that the viewer isn't ready to handle.
@ -189,7 +191,8 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
}
//start with arrow cursor
initCursors();
//initCursors();
initCursors(mUseLegacyCursors); // <FS:LO> Legacy cursor setting from main program
setCursor( UI_CURSOR_ARROW );
allowLanguageTextInput(NULL, FALSE);
@ -1355,9 +1358,15 @@ 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";
/* <FS:LO> Legacy cursor setting from main program
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_TOOLOPEN: return "UI_CURSOR_TOOLOPEN";*/
case UI_CURSOR_TOOLSIT: if (mUseLegacyCursors) return "UI_CURSOR_TOOLSIT_LEGACY"; else return "UI_CURSOR_TOOLSIT";
case UI_CURSOR_TOOLBUY: if (mUseLegacyCursors) return "UI_CURSOR_TOOLBUY_LEGACY"; else return "UI_CURSOR_TOOLBUY";
case UI_CURSOR_TOOLOPEN: if (mUseLegacyCursors) return "UI_CURSOR_TOOLOPEN_LEGACY"; else return "UI_CURSOR_TOOLOPEN";
case UI_CURSOR_TOOLPAY: if (mUseLegacyCursors) return "UI_CURSOR_TOOLPAY_LEGACY"; else return "UI_CURSOR_TOOLBUY";
// </FS:LO>
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";
@ -1468,6 +1477,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:
@ -1493,7 +1503,9 @@ ECursorType LLWindowMacOSX::getCursor() const
return mCurrentCursor;
}
void LLWindowMacOSX::initCursors()
// <FS:LO> Legacy cursor setting from main program
//void LLWindowMacOSX::initCursors()
void LLWindowMacOSX::initCursors(BOOL useLegacyCursors)
{
initPixmapCursor(UI_CURSOR_NO, 8, 8);
initPixmapCursor(UI_CURSOR_WORKING, 1, 1);
@ -1516,9 +1528,25 @@ void LLWindowMacOSX::initCursors()
initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1);
initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1);
initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1);
/* <FS:LO> Legacy cursor setting from main program
initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);*/
if (useLegacyCursors)
{
initPixmapCursor(UI_CURSOR_TOOLSIT, 0, 0);
initPixmapCursor(UI_CURSOR_TOOLBUY, 0, 0);
initPixmapCursor(UI_CURSOR_TOOLOPEN, 0, 0);
initPixmapCursor(UI_CURSOR_TOOLPAY, 0, 0);
}
else
{
initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
initPixmapCursor(UI_CURSOR_TOOLPAY, 20, 15);
}
// </FS:LO>
initPixmapCursor(UI_CURSOR_TOOLPATHFINDING, 16, 16);
initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START, 16, 16);
initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD, 16, 16);

8
indra/llwindow/llwindowmacosx.h
View File

@ -136,10 +136,12 @@ 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);
U32 fsaa_samples, BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
~LLWindowMacOSX();
void initCursors();
//void initCursors();
void initCursors(BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
BOOL isValid();
void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size);
@ -216,6 +218,8 @@ protected:
friend class LLWindowManager;
private
BOOL mUseLegacyCursors; // <FS:LO> Legacy cursor setting from main program
};

31
indra/llwindow/llwindowsdl.cpp
View File

@ -192,10 +192,14 @@ 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)
// <FS:LO> Legacy cursor setting from main program
//BOOL ignore_pixel_depth, U32 fsaa_samples,)
BOOL ignore_pixel_depth, U32 fsaa_samples, BOOL useLegacyCursors)
: LLWindow(callbacks, fullscreen, flags),
Lock_Display(NULL),
Unlock_Display(NULL), mGamma(1.0f)
//Unlock_Display(NULL), mGamma(1.0f)
Unlock_Display(NULL), mGamma(1.0f),
mUseLegacyCursors(useLegacyCursors) // </FS:LO>
{
// Initialize the keyboard
gKeyboard = new LLKeyboardSDL();
@ -238,7 +242,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
gGLManager.initGL();
//start with arrow cursor
initCursors();
initCursors(useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
setCursor( UI_CURSOR_ARROW );
}
@ -802,7 +806,7 @@ BOOL LLWindowSDL::switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL
gGLManager.initGL();
//start with arrow cursor
initCursors();
initCursors(mUseLegacyCursors;); // <FS:LO> Legacy cursor setting from main program
setCursor( UI_CURSOR_ARROW );
}
}
@ -2115,7 +2119,7 @@ void LLWindowSDL::updateCursor()
}
}
void LLWindowSDL::initCursors()
void LLWindowSDL::initCursors(useLegacyCursors) // <FS:LO> Legacy cursor setting from main program
{
int i;
// Blank the cursor pointer array for those we may miss.
@ -2160,9 +2164,24 @@ 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);
/* <FS:LO> Legacy cursor setting from main program
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_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",20,15);*/
if (gSavedSettings.getBOOL("UseLegacyCursors")) {
mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit-legacy.BMP",0,0);
mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy-legacy.BMP",0,0);
mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen-legacy.BMP",0,0);
mSDLCursors[UI_CURSOR_TOOLPAY] = makeSDLCursorFromBMP("toolpay-legacy.BMP",0,0);
}
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);
}
// </FS:LO>
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);

8
indra/llwindow/llwindowsdl.h
View File

@ -151,13 +151,15 @@ 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 ignore_pixel_depth, U32 fsaa_samples, BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
~LLWindowSDL();
/*virtual*/ BOOL isValid();
/*virtual*/ LLSD getNativeKeyData();
void initCursors();
//void initCursors();
void initCursors(BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
void quitCursors();
void moveWindow(const LLCoordScreen& position,const LLCoordScreen& size);
@ -214,6 +216,8 @@ private:
U32 mKeyScanCode;
U32 mKeyVirtualKey;
SDLMod mKeyModifiers;
BOOL mUseLegacyCursors; // <FS:LO> Legacy cursor setting from main program
};

29
indra/llwindow/llwindowwin32.cpp
View File

@ -362,7 +362,9 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
U32 fsaa_samples)
//U32 fsaa_samples)
U32 fsaa_samples,
BOOL useLegacyCursors) // <FS:LO> Legacy cursor setting from main program
: LLWindow(callbacks, fullscreen, flags)
{
@ -637,7 +639,8 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
}
//start with arrow cursor
initCursors();
//initCursors();
initCursors(useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
setCursor( UI_CURSOR_ARROW );
// Initialize (boot strap) the Language text input management,
@ -1664,8 +1667,8 @@ HCURSOR LLWindowWin32::loadColorCursor(LPCTSTR name)
LR_DEFAULTCOLOR);
}
void LLWindowWin32::initCursors()
//void LLWindowWin32::initCursors()
void LLWindowWin32::initCursors(BOOL useLegacyCursors) // <FS:LO> Legacy cursor setting from main program
{
mCursor[ UI_CURSOR_ARROW ] = LoadCursor(NULL, IDC_ARROW);
mCursor[ UI_CURSOR_WAIT ] = LoadCursor(NULL, IDC_WAIT);
@ -1699,9 +1702,25 @@ 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"));
/*<FS:LO> Legacy cursor setting from main program
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_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN"));*/
if (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"));
}
// </FS:LO>
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"));

6
indra/llwindow/llwindowwin32.h
View File

@ -123,10 +123,12 @@ 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 ignore_pixel_depth, U32 fsaa_samples, BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
~LLWindowWin32();
void initCursors();
//void initCursors();
void initCursors(BOOL useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
void initInputDevices();
HCURSOR loadColorCursor(LPCTSTR name);
BOOL isValid();

11
indra/newview/app_settings/settings.xml
View File

@ -17713,6 +17713,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSUseLegacyCursors</key>
<map>
<key>Comment</key>
<string>Use 1.x style cursors instead</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSDisableLoginScreens</key>
<map>
<key>Comment</key>

BIN
indra/newview/cursors_mac/UI_CURSOR_TOOLBUY_LEGACY.tif Normal file
View File

Binary file not shown.

BIN
indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN_LEGACY.tif Normal file
View File

Binary file not shown.

BIN
indra/newview/cursors_mac/UI_CURSOR_TOOLPAY_LEGACY.tif Normal file
View File

Binary file not shown.

BIN
indra/newview/cursors_mac/UI_CURSOR_TOOLSIT_LEGACY.tif Normal file
View File

Binary file not shown.

3
indra/newview/lltoolpie.cpp
View File

@ -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;

6
indra/newview/llviewerwindow.cpp
View File

@ -1705,6 +1705,8 @@ LLViewerWindow::LLViewerWindow(const Params& p)
resetSnapshotLoc();
BOOL useLegacyCursors = gSavedSettings.getBOOL("FSUseLegacyCursors");//<FS:LO> Legacy cursor setting from main program
/*
LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags,
@ -1722,7 +1724,9 @@ LLViewerWindow::LLViewerWindow(const Params& p)
gSavedSettings.getBOOL("DisableVerticalSync"),
!gHeadlessClient,
p.ignore_pixel_depth,
gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled
//gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled
gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples"), //don't use window level anti-aliasing if FBOs are enabled
useLegacyCursors); // <FS:LO> Legacy cursor setting from main program
if (!LLViewerShaderMgr::sInitialized)
{ //immediately initialize shaders

BIN
indra/newview/res-sdl/toolbuy-legacy.BMP Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
indra/newview/res-sdl/toolopen-legacy.BMP Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
indra/newview/res-sdl/toolpay-legacy.BMP Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
indra/newview/res-sdl/toolsit-legacy.BMP Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
indra/newview/res/toolbuy-legacy.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
indra/newview/res/toolopen-legacy.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
indra/newview/res/toolpay-legacy.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
indra/newview/res/toolsit-legacy.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

4
indra/newview/skins/default/xui/de/panel_preferences_skins.xml
View File

@ -13,4 +13,8 @@
(Erfordert Neustart)
</text>
<check_box label="Schaltflächen bei Designwechsel auf Standard-Layout zurücksetzen" tool_tip="Falls aktiviert, werden beim Wechsel der Benutzeroberfläche oder des Login-Modus die Schaltflächen auf das dazugehörige Standardlayout zurückgesetzt." name="reset_toolbar_settings"/>
<check_box label="Cursor im Viewer 1-Stil verwenden" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
(Erfordert Neustart)
</text>
</panel>

32
indra/newview/skins/default/xui/en/panel_preferences_skins.xml
View File

@ -91,4 +91,36 @@
top_pad="20"
name="reset_toolbar_settings"
width="200" />
<check_box
control_name="FSUseLegacyCursors"
enabled="false"
follows="left|top"
height="16"
initial_value="true"
label="Use Viewer 1 style cursors"
layout="topleft"
left="30"
top_pad="20"
name="use_legacy_cursors"
width="200" />
<text
font="SansSerifSmall"
type="string"
text_color="White_50"
length="1"
follows="left|top"
height="18"
layout="topleft"
left_pad="30"
name="theme_textbox3"
width="200">
(Requires restart)
</text>
</panel>

4
indra/newview/skins/default/xui/es/panel_preferences_skins.xml
View File

@ -13,4 +13,8 @@
(Requiere reiniciar)
</text>
<check_box label="Restablecer las barras de herramientas cuando se cambie de skin." tool_tip="Cuando está activa, esta opción preserva la disposición de las barras de herramientas tal como están diseñadas para la skin seleccionada, ignorando tu personalización cuando cambias de skin o de modo." name="reset_toolbar_settings"/>
<check_box label="Usar cursores estilo Viewer 1" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
(Requiere reiniciar)
</text>
</panel>

4
indra/newview/skins/default/xui/it/panel_preferences_skins.xml
View File

@ -13,4 +13,8 @@
(Richiesto riavvio)
</text>
<check_box label="Ripristina le Toolbar di default della skin quando viene cambiata. (Consigliato)" tool_tip="Quando quest'opzione è attiva le toolbar verranno ripristinate come di default e tutti i cambiamenti effettuati dall'utente sull'interfaccia delle toolbar verranno ignorate e ripristinate." name="reset_toolbar_settings"/>
<check_box label="Utilizza i cursori del Viewer 1.x" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
(Richiesto riavvio)
</text>
</panel>

5
indra/newview/skins/default/xui/ja/panel_preferences_skins.xml
View File

@ -15,4 +15,9 @@
</text>
<check_box label="ツールバーの配置をスキンの初期設定に戻す" name="reset_toolbar_settings" />
<check_box label="V1スタイルのカーソルを使用" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
（再起動が必要）
</text>
</panel>

4
indra/newview/skins/default/xui/pl/panel_preferences_skins.xml
View File

@ -13,4 +13,8 @@
(wymaga restartu)
</text>
<check_box label="Resetuj przyciski na paskach po zmianie skórki" tool_tip="Gdy włączysz tą opcję, to predefiniowany układ przycisków ustawiony przez programistów Firestorma nadpisze Twój własny po zmianie skórki lub trybu logowania do świata." name="reset_toolbar_settings"/>
<check_box label="Używaj stylu kursorów z Viewer 1.x" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
(wymaga restartu)
</text>
</panel>

4
indra/newview/skins/default/xui/ru/panel_preferences_skins.xml
View File

@ -12,4 +12,8 @@
<text name="theme_textbox2">
(Требуется перезагрузка)
</text>
<check_box label="Использовать курсор стиля Viewer 1" name="use_legacy_cursors" control_name="FSUseLegacyCursors"/>
<text name="theme_textbox3">
(Требуется перезагрузка)
</text>
</panel>