diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llpanelcontents.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 14 |
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; |