1 files changed, 27 insertions, 11 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 128a802..3c29cfd 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -2232,8 +2232,8 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name)
         BOOL identical = TRUE;
         BOOL first = TRUE;
         LLUUID first_id;
-        for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
-                 iter != getSelection()->root_end(); iter++ )
+        for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin();
+                 iter != getSelection()->root_object_end(); iter++ )
         {
                 LLSelectNode* node = *iter;     
                 if (!node->mValid)
@@ -2255,7 +2255,11 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name)
                         }
                 }
         }
-
+        if (first_id.isNull())
+        {
+                return FALSE;
+        }
+        
         result_id = first_id;
         
         if (identical)
@@ -2286,8 +2290,8 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name)
         BOOL first = TRUE;
         BOOL first_group_owned = FALSE;
         LLUUID first_id;
-        for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
-                 iter != getSelection()->root_end(); iter++ )
+        for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin();
+                 iter != getSelection()->root_object_end(); iter++ )
         {
                 LLSelectNode* node = *iter;     
                 if (!node->mValid)
@@ -2312,6 +2316,10 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name)
                         }
                 }
         }
+        if (first_id.isNull())
+        {
+                return FALSE;
+        }
 
         result_id = first_id;
         
@@ -2354,8 +2362,8 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, LLString& name)
         BOOL identical = TRUE;
         BOOL first = TRUE;
         LLUUID first_id;
-        for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
-                 iter != getSelection()->root_end(); iter++ )
+        for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin();
+                 iter != getSelection()->root_object_end(); iter++ )
         {
                 LLSelectNode* node = *iter;     
                 if (!node->mValid)
@@ -2377,6 +2385,10 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, LLString& name)
                         }
                 }
         }
+        if (first_id.isNull())
+        {
+                return FALSE;
+        }
 
         result_id = first_id;
         
@@ -2415,8 +2427,8 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
         BOOL identical = TRUE;
         BOOL first = TRUE;
         LLUUID first_id;
-        for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
-                 iter != getSelection()->root_end(); iter++ )
+        for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin();
+                 iter != getSelection()->root_object_end(); iter++ )
         {
                 LLSelectNode* node = *iter;     
                 if (!node->mValid)
@@ -2438,6 +2450,10 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
                         }
                 }
         }
+        if (first_id.isNull())
+        {
+                return FALSE;
+        }
         
         result_id = first_id;
 
@@ -2452,8 +2468,8 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
 BOOL LLSelectMgr::selectIsGroupOwned()
 {
         BOOL found_one = FALSE;
-        for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
-                 iter != getSelection()->root_end(); iter++ )
+        for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin();
+                 iter != getSelection()->root_object_end(); iter++ )
         {
                 LLSelectNode* node = *iter;     
                 if (!node->mValid)