1 files changed, 9 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c7207ba..c2a8055 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4903,13 +4903,20 @@ class LLToolsLookAtSelection : public view_listener_t
                         LLVector3 obj_to_cam = LLViewerCamera::getInstance()->getOrigin() - selection_bbox.getCenterAgent();
                         obj_to_cam.normVec();
 
+                        LLUUID object_id;
+                        if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
+                        {
+                                object_id = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID;
+                        }
                         if (zoom)
                         {
-                                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID );
+                                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), 
+                                                                                                LLSelectMgr::getInstance()->getSelectionCenterGlobal(), 
+                                                                                                object_id );
                         }
                         else
                         {
-                                gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID );
+                                gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), object_id );
                         }
                 }
                 return true;