diff options
| author | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-08 13:23:54 -0700 |
| commit | d9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch) | |
| tree | 1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/newview/llpanelcontents.cpp | |
| parent | Merged working branch of 1.2 into LL 1.23 merge (diff) | |
| parent | Changed version to 1.20 in other files (diff) | |
| download | meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2 meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz | |
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelcontents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp index d576a20..33cebec 100644 --- a/linden/indra/newview/llpanelcontents.cpp +++ b/linden/indra/newview/llpanelcontents.cpp | |||
| @@ -157,10 +157,10 @@ void LLPanelContents::onClickNewScript(void *userdata) | |||
| 157 | LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); | 157 | LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok); |
| 158 | if(object) | 158 | if(object) |
| 159 | { | 159 | { |
| 160 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 160 | // [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) |
| 161 | if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()] | 161 | if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()] |
| 162 | { | 162 | { |
| 163 | if (!gRlvHandler.isDetachable(object)) | 163 | if (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) |
| 164 | { | 164 | { |
| 165 | return; // Disallow creating new scripts in a locked attachment | 165 | return; // Disallow creating new scripts in a locked attachment |
| 166 | } | 166 | } |