aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llpanelcontents.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llpanelcontents.cpp')
-rw-r--r--linden/indra/newview/llpanelcontents.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 6fa34cf..47f2d35 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -115,8 +115,8 @@ void LLPanelContents::getState(LLViewerObject *objectp )
115 // unambiguous destination for the object. 115 // unambiguous destination for the object.
116 if( editable && 116 if( editable &&
117 all_volume && 117 all_volume &&
118 ((gSelectMgr->getRootObjectCount() == 1) 118 ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
119 || (gSelectMgr->getObjectCount() == 1))) 119 || (gSelectMgr->getSelection()->getObjectCount() == 1)))
120 { 120 {
121 //mBtnNewScript->setEnabled(TRUE); 121 //mBtnNewScript->setEnabled(TRUE);
122 childSetEnabled("button new script",TRUE); 122 childSetEnabled("button new script",TRUE);
@@ -131,10 +131,10 @@ void LLPanelContents::getState(LLViewerObject *objectp )
131 131
132void LLPanelContents::refresh() 132void LLPanelContents::refresh()
133{ 133{
134 LLViewerObject* object = gSelectMgr->getFirstRootObject(); 134 LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
135 if(!object) 135 if(!object)
136 { 136 {
137 object = gSelectMgr->getFirstObject(); 137 object = gSelectMgr->getSelection()->getFirstObject();
138 } 138 }
139 139
140 getState(object); 140 getState(object);
@@ -153,10 +153,10 @@ void LLPanelContents::refresh()
153// static 153// static
154void LLPanelContents::onClickNewScript(void *userdata) 154void LLPanelContents::onClickNewScript(void *userdata)
155{ 155{
156 LLViewerObject* object = gSelectMgr->getFirstRootObject(); 156 LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
157 if(!object) 157 if(!object)
158 { 158 {
159 object = gSelectMgr->getFirstObject(); 159 object = gSelectMgr->getSelection()->getFirstObject();
160 } 160 }
161 if(object) 161 if(object)
162 { 162 {
@@ -203,7 +203,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
203 "Script: New Script", 203 "Script: New Script",
204 object->mID, 204 object->mID,
205 LLUUID::null); 205 LLUUID::null);
206 editor->open(); 206 editor->open(); /*Flawfinder: ignore*/
207 207
208 // keep onscreen 208 // keep onscreen
209 gFloaterView->adjustToFitScreen(editor, FALSE); 209 gFloaterView->adjustToFitScreen(editor, FALSE);