diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llpanelcontents.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llpanelcontents.cpp')
-rw-r--r-- | linden/indra/newview/llpanelcontents.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp index 631f1a7..be4d9db 100644 --- a/linden/indra/newview/llpanelcontents.cpp +++ b/linden/indra/newview/llpanelcontents.cpp | |||
@@ -109,20 +109,20 @@ void LLPanelContents::getState(LLViewerObject *objectp ) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | LLUUID group_id; // used for SL-23488 | 111 | LLUUID group_id; // used for SL-23488 |
112 | gSelectMgr->selectGetGroup(group_id); // sets group_id as a side effect SL-23488 | 112 | LLSelectMgr::getInstance()->selectGetGroup(group_id); // sets group_id as a side effect SL-23488 |
113 | 113 | ||
114 | // BUG? Check for all objects being editable? | 114 | // BUG? Check for all objects being editable? |
115 | BOOL editable = gAgent.isGodlike() | 115 | BOOL editable = gAgent.isGodlike() |
116 | || (objectp->permModify() | 116 | || (objectp->permModify() |
117 | && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 | 117 | && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 |
118 | BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); | 118 | BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); |
119 | 119 | ||
120 | // Edit script button - ok if object is editable and there's an | 120 | // Edit script button - ok if object is editable and there's an |
121 | // unambiguous destination for the object. | 121 | // unambiguous destination for the object. |
122 | if( editable && | 122 | if( editable && |
123 | all_volume && | 123 | all_volume && |
124 | ((gSelectMgr->getSelection()->getRootObjectCount() == 1) | 124 | ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1) |
125 | || (gSelectMgr->getSelection()->getObjectCount() == 1))) | 125 | || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1))) |
126 | { | 126 | { |
127 | //mBtnNewScript->setEnabled(TRUE); | 127 | //mBtnNewScript->setEnabled(TRUE); |
128 | childSetEnabled("button new script",TRUE); | 128 | childSetEnabled("button new script",TRUE); |
@@ -138,7 +138,7 @@ void LLPanelContents::getState(LLViewerObject *objectp ) | |||
138 | void LLPanelContents::refresh() | 138 | void LLPanelContents::refresh() |
139 | { | 139 | { |
140 | const BOOL children_ok = TRUE; | 140 | const BOOL children_ok = TRUE; |
141 | LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok); | 141 | LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); |
142 | 142 | ||
143 | getState(object); | 143 | getState(object); |
144 | if (mPanelInventory) | 144 | if (mPanelInventory) |
@@ -157,7 +157,7 @@ void LLPanelContents::refresh() | |||
157 | void LLPanelContents::onClickNewScript(void *userdata) | 157 | void LLPanelContents::onClickNewScript(void *userdata) |
158 | { | 158 | { |
159 | const BOOL children_ok = TRUE; | 159 | const BOOL children_ok = TRUE; |
160 | LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok); | 160 | LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); |
161 | if(object) | 161 | if(object) |
162 | { | 162 | { |
163 | LLPermissions perm; | 163 | LLPermissions perm; |