Second Life viewer sources 1.19.1.3

1 files changed, 9 insertions, 6 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index da71c6b..366f770 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4650,14 +4650,14 @@ void LLSelectMgr::updateSilhouettes()
                          iter != roots.end(); iter++)
                 {
                         LLViewerObject* objectp = *iter;
-                        LLSelectNode* rect_select_root_node = new LLSelectNode(objectp, TRUE);
-                        rect_select_root_node->selectAllTEs(TRUE);
-
                         if (!canSelectObject(objectp))
                         {
                                 continue;
                         }
 
+                        LLSelectNode* rect_select_root_node = new LLSelectNode(objectp, TRUE);
+                        rect_select_root_node->selectAllTEs(TRUE);
+
                         if (!select_linked_set)
                         {
                                 rect_select_root_node->mIndividualSelection = TRUE;
@@ -5666,6 +5666,12 @@ void LLSelectMgr::validateSelection()
 
 BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
 {
+        // Never select dead objects
+        if (!object || object->isDead())
+        {
+                return FALSE;
+        }
+        
         if (mForceSelection)
         {
                 return TRUE;
@@ -5678,9 +5684,6 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
                 return FALSE;
         }
 
-        // Can't select dead objects
-        if (object->isDead()) return FALSE;
-
         // Can't select orphans
         if (object->isOrphaned()) return FALSE;