From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 10 Oct 2007 00:01:43 +0000
Subject: svn merge -r71238:71367
 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

---
 indra/newview/llfloatertelehub.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llfloatertelehub.cpp')

diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp
index b0158aaaff..95a47bb2ac 100644
--- a/indra/newview/llfloatertelehub.cpp
+++ b/indra/newview/llfloatertelehub.cpp
@@ -129,11 +129,8 @@ void LLFloaterTelehub::draw()
 // Per-frame updates, because we don't have a selection manager observer.
 void LLFloaterTelehub::refresh()
 {
-	LLViewerObject* object = mObjectSelection->getFirstRootObject();
-	if(!object)
-	{
-		object = mObjectSelection->getFirstObject();
-	}
+	const BOOL children_ok = TRUE;
+	LLViewerObject* object = mObjectSelection->getFirstRootObject(children_ok);
 	
 	BOOL have_selection = (object != NULL);
 	BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
-- 
cgit v1.2.3