aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertelehub.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llfloatertelehub.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llfloatertelehub.cpp')
-rw-r--r--linden/indra/newview/llfloatertelehub.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index e48b6ca..95a47bb 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -3,6 +3,8 @@
3 * @author James Cook 3 * @author James Cook
4 * @brief LLFloaterTelehub class implementation 4 * @brief LLFloaterTelehub class implementation
5 * 5 *
6 * $LicenseInfo:firstyear=2005&license=viewergpl$
7 *
6 * Copyright (c) 2005-2007, Linden Research, Inc. 8 * Copyright (c) 2005-2007, Linden Research, Inc.
7 * 9 *
8 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 27 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27 * COMPLETENESS OR PERFORMANCE. 29 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$
28 */ 31 */
29 32
30#include "llviewerprecompiledheaders.h" 33#include "llviewerprecompiledheaders.h"
@@ -126,11 +129,8 @@ void LLFloaterTelehub::draw()
126// Per-frame updates, because we don't have a selection manager observer. 129// Per-frame updates, because we don't have a selection manager observer.
127void LLFloaterTelehub::refresh() 130void LLFloaterTelehub::refresh()
128{ 131{
129 LLViewerObject* object = mObjectSelection->getFirstRootObject(); 132 const BOOL children_ok = TRUE;
130 if(!object) 133 LLViewerObject* object = mObjectSelection->getFirstRootObject(children_ok);
131 {
132 object = mObjectSelection->getFirstObject();
133 }
134 134
135 BOOL have_selection = (object != NULL); 135 BOOL have_selection = (object != NULL);
136 BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); 136 BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );