SL-14664 Added zoomout and sizeall

Remade code to use getCursorFromString

6 files changed, 1 insertions, 52 deletions

diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZEALL.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZEALL.tif
new file mode 100644
index 0000000000..85fec76fca
--- /dev/null
+++ b/indra/newview/cursors_mac/UI_CURSOR_SIZEALL.tif
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMOUT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMOUT.tif
new file mode 100644
index 0000000000..d64a7f2b68
--- /dev/null
+++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMOUT.tif
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 8cf9f4a85c..661a520394 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -3193,58 +3193,7 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
 			LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CURSOR_CHANGED, new cursor is " << plugin->getCursorName() << LL_ENDL;
 
 			std::string cursor = plugin->getCursorName();
-
-            static const std::map<std::string, ECursorType> cursor_name_to_enum
-            {
-                {std::string("arrow"), UI_CURSOR_ARROW},
-                {std::string("wait"), UI_CURSOR_WAIT},
-                {std::string("hand"), UI_CURSOR_HAND},
-                {std::string("ibeam"), UI_CURSOR_IBEAM},
-                {std::string("cross"), UI_CURSOR_CROSS},
-                {std::string("split_nwse"), UI_CURSOR_SIZENWSE},
-                {std::string("split_nesw"), UI_CURSOR_SIZENESW},
-                {std::string("split_we"), UI_CURSOR_SIZEWE},
-                {std::string("split_ns"), UI_CURSOR_SIZENS},
-                {std::string("cursor_no"), UI_CURSOR_NO},
-                {std::string("working"), UI_CURSOR_WORKING},
-                {std::string("tool_grab"), UI_CURSOR_TOOLGRAB},
-                {std::string("tool_land"), UI_CURSOR_TOOLLAND},
-                {std::string("tool_focus"), UI_CURSOR_TOOLFOCUS},
-                {std::string("tool_create"), UI_CURSOR_TOOLCREATE},
-                {std::string("arrow_drag"), UI_CURSOR_ARROWDRAG},
-                {std::string("arrow_copy"), UI_CURSOR_ARROWCOPY},
-                {std::string("arrow_drag_multi"), UI_CURSOR_ARROWDRAGMULTI},
-                {std::string("arrow_copy_multi"), UI_CURSOR_ARROWCOPYMULTI},
-                {std::string("cursor_no_locked"), UI_CURSOR_NOLOCKED},
-                {std::string("arrow_locked"), UI_CURSOR_ARROWLOCKED},
-                {std::string("grab_locked"), UI_CURSOR_GRABLOCKED},
-                {std::string("tool_translate"), UI_CURSOR_TOOLTRANSLATE},
-                {std::string("tool_rotate"), UI_CURSOR_TOOLROTATE},
-                {std::string("tool_scale"), UI_CURSOR_TOOLSCALE},
-                {std::string("tool_camera"), UI_CURSOR_TOOLCAMERA},
-                {std::string("tool_pan"), UI_CURSOR_TOOLPAN},
-                {std::string("tool_zoomin"), UI_CURSOR_TOOLZOOMIN},
-                {std::string("tool_pick_object3"), UI_CURSOR_TOOLPICKOBJECT3},
-                {std::string("tool_play"), UI_CURSOR_TOOLPLAY},
-                {std::string("tool_pause"), UI_CURSOR_TOOLPAUSE},
-                {std::string("tool_media_open"), UI_CURSOR_TOOLMEDIAOPEN},
-                {std::string("tool_pipette"), UI_CURSOR_PIPETTE},
-                {std::string("tool_sit"), UI_CURSOR_TOOLSIT},
-                {std::string("tool_buy"), UI_CURSOR_TOOLBUY},
-                {std::string("tool_open"), UI_CURSOR_TOOLOPEN},
-                {std::string("tool_pathfinding"), UI_CURSOR_TOOLPATHFINDING},
-            };
-
-            std::map<std::string, ECursorType>::const_iterator iter = cursor_name_to_enum.find(cursor);
-            if (iter != cursor_name_to_enum.end())
-            {
-                mLastSetCursor = iter->second;
-            }
-            else
-            {
-                // for anything else, default to the arrow
-                mLastSetCursor = UI_CURSOR_ARROW;
-            }
+			mLastSetCursor = getCursorFromString(cursor);
 		}
 		break;
 
diff --git a/indra/newview/res-sdl/lltoolzoomout.BMP b/indra/newview/res-sdl/lltoolzoomout.BMP
index 7f958383ab..5bdf96f80d 100644
--- a/indra/newview/res-sdl/lltoolzoomout.BMP
+++ b/indra/newview/res-sdl/lltoolzoomout.BMP
diff --git a/indra/newview/res-sdl/sizeall.BMP b/indra/newview/res-sdl/sizeall.BMP
new file mode 100644
index 0000000000..03d9bf4654
--- /dev/null
+++ b/indra/newview/res-sdl/sizeall.BMP
diff --git a/indra/newview/res/lltoolzoomout.cur b/indra/newview/res/lltoolzoomout.cur
index b33e68d1a6..21e0ee9702 100644
--- a/indra/newview/res/lltoolzoomout.cur
+++ b/indra/newview/res/lltoolzoomout.cur