aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpanelcontents.cpp')
-rw-r--r--linden/indra/newview/llpanelcontents.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index e13ec46..6462d44 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -121,11 +121,11 @@ void LLPanelContents::getState(LLViewerObject *objectp )
121 && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488 121 && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) ))); // solves SL-23488
122 BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ); 122 BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
123 123
124// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g 124// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
125 if ( (rlv_handler_t::isEnabled()) && (editable) ) 125 if ( (rlv_handler_t::isEnabled()) && (editable) )
126 { 126 {
127 // Don't allow creation of new scripts if it's undetachable 127 // Don't allow creation of new scripts if it's undetachable
128 editable = gRlvHandler.isDetachable(objectp); 128 editable = !gRlvHandler.isLockedAttachment(objectp, RLV_LOCK_REMOVE);
129 129
130 // Don't allow creation of new scripts if we're @unsit=n or @sittp=n restricted and we're sitting on the selection 130 // Don't allow creation of new scripts if we're @unsit=n or @sittp=n restricted and we're sitting on the selection
131 if ( (editable) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) ) 131 if ( (editable) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
@@ -182,10 +182,10 @@ void LLPanelContents::onClickNewScript(void *userdata)
182 LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); 182 LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
183 if(object) 183 if(object)
184 { 184 {
185// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) 185// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a)
186 if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()] 186 if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()]
187 { 187 {
188 if (!gRlvHandler.isDetachable(object)) 188 if (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE))
189 { 189 {
190 return; // Disallow creating new scripts in a locked attachment 190 return; // Disallow creating new scripts in a locked attachment
191 } 191 }