diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/llpanelcontents.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 848a9c26ae..4c76e7491b 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -96,8 +96,8 @@ void LLPanelContents::getState(LLViewerObject *objectp ) // unambiguous destination for the object. if( editable && all_volume && - ((gSelectMgr->getRootObjectCount() == 1) - || (gSelectMgr->getObjectCount() == 1))) + ((gSelectMgr->getSelection()->getRootObjectCount() == 1) + || (gSelectMgr->getSelection()->getObjectCount() == 1))) { //mBtnNewScript->setEnabled(TRUE); childSetEnabled("button new script",TRUE); @@ -112,10 +112,10 @@ void LLPanelContents::getState(LLViewerObject *objectp ) void LLPanelContents::refresh() { - LLViewerObject* object = gSelectMgr->getFirstRootObject(); + LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(); if(!object) { - object = gSelectMgr->getFirstObject(); + object = gSelectMgr->getSelection()->getFirstObject(); } getState(object); @@ -134,10 +134,10 @@ void LLPanelContents::refresh() // static void LLPanelContents::onClickNewScript(void *userdata) { - LLViewerObject* object = gSelectMgr->getFirstRootObject(); + LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(); if(!object) { - object = gSelectMgr->getFirstObject(); + object = gSelectMgr->getSelection()->getFirstObject(); } if(object) { |