1 files changed, 9 insertions, 6 deletions

diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index a7312fc..e405dc4 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -349,7 +349,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
         if (!selected_object)
         {
                 // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no selected object" << llendl;
                 gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                 return TRUE;
         }
@@ -367,9 +367,12 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
         if (mManipPart >= LL_YZ_PLANE && mManipPart <= LL_XY_PLANE)
         {
                 LLCoordGL mouse_pos;
-                gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos);
-
-                if (gSavedSettings.getBOOL("SnapToMouseCursor"))
+                if (!gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos))
+                {
+                        // mouse_pos may be nonsense
+                        llwarns << "Failed to project object center to screen" << llendl;
+                }
+                else if (gSavedSettings.getBOOL("SnapToMouseCursor"))
                 {
                         LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
                         x = mouse_pos.mX;
@@ -480,7 +483,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
         if (!selectNode)
         {
                 // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no selectNode" << llendl;
                 gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                 return TRUE;
         }
@@ -489,7 +492,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
         if (!object)
         {
                 // somehow we lost the object!
-                llwarns << "Translate manip lost the object" << llendl;
+                llwarns << "Translate manip lost the object, no object in selectNode" << llendl;
                 gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
                 return TRUE;
         }