diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-31 15:25:03 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-31 15:25:03 +0100 |
| commit | 7cf27a4881533eab4735e980c00e5ce7bfb1c986 (patch) | |
| tree | d2484b5940d960221a5f23b0f6500c00f0315b76 | |
| parent | aef321ad4a5f2d5cc0f5a25109cb97cef7c21123 (diff) | |
| parent | 3e11f81b693cf17e767d8890a5d02ae2c152d20f (diff) | |
merge
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/res-sdl/toolbuy.BMP | bin | 0 -> 3126 bytes | |||
| -rw-r--r-- | indra/newview/res-sdl/toolopen.BMP | bin | 0 -> 3126 bytes | |||
| -rw-r--r-- | indra/newview/res-sdl/toolsit.BMP | bin | 0 -> 3126 bytes |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 4d25b4134e..399d284402 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2074,6 +2074,9 @@ 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 (getenv("LL_ATI_MOUSE_CURSOR_BUG") != NULL) { llinfos << "Disabling cursor updating due to LL_ATI_MOUSE_CURSOR_BUG" << llendl; diff --git a/indra/newview/res-sdl/toolbuy.BMP b/indra/newview/res-sdl/toolbuy.BMP Binary files differnew file mode 100644 index 0000000000..07e9273721 --- /dev/null +++ b/indra/newview/res-sdl/toolbuy.BMP diff --git a/indra/newview/res-sdl/toolopen.BMP b/indra/newview/res-sdl/toolopen.BMP Binary files differnew file mode 100644 index 0000000000..5b87979304 --- /dev/null +++ b/indra/newview/res-sdl/toolopen.BMP diff --git a/indra/newview/res-sdl/toolsit.BMP b/indra/newview/res-sdl/toolsit.BMP Binary files differnew file mode 100644 index 0000000000..8ce59ae97a --- /dev/null +++ b/indra/newview/res-sdl/toolsit.BMP |
