diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp
index c0676f8c1314937c28c6b71c80298de1f6cb7e68..ec60097195b64b3e00b5fe37e215c3a7a934e170 100644
--- a/indra/llcommon/llcursortypes.cpp
+++ b/indra/llcommon/llcursortypes.cpp
@@ -71,7 +71,9 @@ ECursorType getCursorFromString(const std::string& cursor_string)
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;
+ cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHSTARTADD"] = UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD;
cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHEND"] = UI_CURSOR_TOOLPATHFINDING_PATH_END;
+ cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHENDADD"] = UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD;
cursor_string_table["UI_CURSOR_TOOLNO"] = UI_CURSOR_TOOLNO;
}
diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h
index f47a328f7735c750ccdbcca8160a1a8cc8153bd4..cb6d6636a0f9307d4e6764338fd9260c0053e76f 100644
--- a/indra/llcommon/llcursortypes.h
+++ b/indra/llcommon/llcursortypes.h
@@ -67,7 +67,9 @@ enum ECursorType {
UI_CURSOR_TOOLOPEN,
UI_CURSOR_TOOLPATHFINDING,
UI_CURSOR_TOOLPATHFINDING_PATH_START,
+ UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD,
UI_CURSOR_TOOLPATHFINDING_PATH_END,
+ UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD,
UI_CURSOR_TOOLNO,
UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor)
};
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 5f637bc6f122a36746b321a8ee1cefe82fff539d..be0f8bc7af33e24c47138f5f75280a0f7848a370 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1699,8 +1699,10 @@ void LLWindowWin32::initCursors()
mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY"));
mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN"));
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"));
mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_END ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHEND"));
+ mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHENDADD"));
mCursor[ UI_CURSOR_TOOLNO ] = LoadCursor(module, TEXT("TOOLNO"));
// Color cursors
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6358464fb0818339e1c4b91e4a5cc6dd146f287f..ac0b0c0351c753ec078b583f7db1a1968f672247 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1342,7 +1342,9 @@ if (WINDOWS)
res/lltoolpan.cur
res/lltoolpathfinding.cur
res/lltoolpathfindingpathend.cur
+ res/lltoolpathfindingpathendadd.cur
res/lltoolpathfindingpathstart.cur
+ res/lltoolpathfindingpathstartadd.cur
res/lltoolpipette.cur
res/lltoolrotate.cur
res/lltoolscale.cur
diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index 82426920d8c5342f7007cc795b3f597fa9488aa7..fde2257777d3c7ad7ef490bfecd65eb5fb988c4e 100644
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -72,11 +72,11 @@ BOOL LLPathfindingPathTool::handleMouseDown(S32 pX, S32 pY, MASK pMask)
{
if (isPointAModKeys(pMask))
{
- gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD);
}
else if (isPointBModKeys(pMask))
{
- gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD);
}
computeFinalPoints(pX, pY, pMask);
mIsLeftMouseButtonHeld = true;
@@ -169,11 +169,25 @@ BOOL LLPathfindingPathTool::handleHover(S32 pX, S32 pY, MASK pMask)
{
if (isPointAModKeys(pMask))
{
- gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START);
+ if (mIsLeftMouseButtonHeld)
+ {
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD);
+ }
+ else
+ {
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START);
+ }
}
else if (isPointBModKeys(pMask))
{
- gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END);
+ if (mIsLeftMouseButtonHeld)
+ {
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD);
+ }
+ else
+ {
+ gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END);
+ }
}
computeTempPoints(pX, pY, pMask);
returnVal = TRUE;
diff --git a/indra/newview/res/lltoolpathfinding.cur b/indra/newview/res/lltoolpathfinding.cur
index 40c5a40905c8a270e2692688cce66dc81ff6673a..2aba2daa45a671f069ed52348822f53219d73755 100644
Binary files a/indra/newview/res/lltoolpathfinding.cur and b/indra/newview/res/lltoolpathfinding.cur differ
diff --git a/indra/newview/res/lltoolpathfindingpathend.cur b/indra/newview/res/lltoolpathfindingpathend.cur
index df8d56d205fed56059e5fe17bce77e9d5e22cec2..e951a6956ba90a7fd4739479e48d3a54b570ebc3 100644
Binary files a/indra/newview/res/lltoolpathfindingpathend.cur and b/indra/newview/res/lltoolpathfindingpathend.cur differ
diff --git a/indra/newview/res/lltoolpathfindingpathendadd.cur b/indra/newview/res/lltoolpathfindingpathendadd.cur
new file mode 100644
index 0000000000000000000000000000000000000000..0bf3201b2360c9d91bfd88b669b5c92262c6a358
Binary files /dev/null and b/indra/newview/res/lltoolpathfindingpathendadd.cur differ
diff --git a/indra/newview/res/lltoolpathfindingpathstart.cur b/indra/newview/res/lltoolpathfindingpathstart.cur
index 5c38bb6c008ee2dd0f7dcec7ada9fa3e0cbef30e..fecc716990c052122bde6af4bf193a0cc57c58bf 100644
Binary files a/indra/newview/res/lltoolpathfindingpathstart.cur and b/indra/newview/res/lltoolpathfindingpathstart.cur differ
diff --git a/indra/newview/res/lltoolpathfindingpathstartadd.cur b/indra/newview/res/lltoolpathfindingpathstartadd.cur
new file mode 100644
index 0000000000000000000000000000000000000000..45e23e5161f7d0370af0b3d4f917535c24a3c751
Binary files /dev/null and b/indra/newview/res/lltoolpathfindingpathstartadd.cur differ
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 0b469c8d810adef1755a2e8b5313d018a7fd04d9..df75f3f697f7fd2adc591037ca33c56d38d4d920 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -124,7 +124,9 @@ TOOLOPEN CURSOR "toolopen.cur"
TOOLSIT CURSOR "toolsit.cur"
TOOLPATHFINDING CURSOR "lltoolpathfinding.cur"
TOOLPATHFINDINGPATHSTART CURSOR "lltoolpathfindingpathstart.cur"
-TOOLPATHFINDINGPATHEND CURSOR "lltoolpathfindingpathend.cur"
+TOOLPATHFINDINGPATHSTARTADD CURSOR "lltoolpathfindingpathstartadd.cur"
+TOOLPATHFINDINGPATHEND CURSOR "lltoolpathfindingpathend.cur"
+TOOLPATHFINDINGPATHENDADD CURSOR "lltoolpathfindingpathendadd.cur"
TOOLNO CURSOR "llno.cur"
/////////////////////////////////////////////////////////////////////////////