1 files changed, 11 insertions, 7 deletions

diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index e57f5fb..479d55c 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -62,9 +62,6 @@ BOOL gCameraBtnPan = FALSE;
 const S32 SLOP_RANGE = 4;
 const F32 FOCUS_OFFSET_FACTOR = 1.f;
 
-extern void handle_first_tool(void*);
-
-
 //
 // Camera - shared functionality
 //
@@ -91,13 +88,19 @@ LLToolCamera::~LLToolCamera()
 // virtual
 void LLToolCamera::handleSelect()
 {
-        gFloaterTools->setStatusText("Click and drag to change view");
+        if (gFloaterTools)
+        {
+                gFloaterTools->setStatusText("Click and drag to change view");
+        }
 }
 
 // virtual
 void LLToolCamera::handleDeselect()
 {
-        gFloaterTools->setStatusText("");
+        if (gFloaterTools)
+        {
+                gFloaterTools->setStatusText("");
+        }
 //      gAgent.setLookingAtAvatar(FALSE);
 }
 
@@ -155,7 +158,8 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
         // check for hud attachments
         if (hit_obj && hit_obj->isHUDAttachment())
         {
-                if (!gSelectMgr->getObjectCount() || gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                if (!selection->getObjectCount() || selection->getSelectType() != SELECT_TYPE_HUD)
                 {
                         gToolCamera->mValidClickPoint = FALSE;
                         return;
@@ -194,7 +198,7 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
         }
         //RN: check to see if this is mouse-driving as opposed to ALT-zoom or Focus tool
         else if (mask & MASK_ALT || 
-                        (gToolMgr->getCurrentTool(mask)->getName() == "Camera")) 
+                        (gToolMgr->getCurrentTool()->getName() == "Camera")) 
         {
                 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
                 if (hit_obj)