summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
-rw-r--r--indra/newview/llpanelcontents.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index ec966d2fc5..50ff7bd9eb 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -138,11 +138,8 @@ void LLPanelContents::getState(LLViewerObject *objectp )
void LLPanelContents::refresh()
{
- LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
- if(!object)
- {
- object = gSelectMgr->getSelection()->getFirstObject();
- }
+ const BOOL children_ok = TRUE;
+ LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok);
getState(object);
if (mPanelInventory)
@@ -160,11 +157,8 @@ void LLPanelContents::refresh()
// static
void LLPanelContents::onClickNewScript(void *userdata)
{
- LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
- if(!object)
- {
- object = gSelectMgr->getSelection()->getFirstObject();
- }
+ const BOOL children_ok = TRUE;
+ LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok);
if(object)
{
LLPermissions perm;