diff options
| author | McCabe Maxsted | 2009-03-01 04:33:54 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-03-01 04:33:54 -0700 |
| commit | ddc9815e2f7a2bd077cdae149a4e95a45de2f9f6 (patch) | |
| tree | 8d8e94dd2af3399e1ced240614f790b7d7693f3d /linden/indra/newview/llviewermenu.cpp | |
| parent | Backported fix for VWR-3871 (prim position appears to be off) from 1.22 (diff) | |
| download | meta-impy-ddc9815e2f7a2bd077cdae149a4e95a45de2f9f6.zip meta-impy-ddc9815e2f7a2bd077cdae149a4e95a45de2f9f6.tar.gz meta-impy-ddc9815e2f7a2bd077cdae149a4e95a45de2f9f6.tar.bz2 meta-impy-ddc9815e2f7a2bd077cdae149a4e95a45de2f9f6.tar.xz | |
Backported fix for SVC-2771 (script resetting can fail) from 1.22
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 31fdcc3..486e4f1 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -5963,8 +5963,9 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons | |||
| 5963 | { | 5963 | { |
| 5964 | // Apply until an object fails | 5964 | // Apply until an object fails |
| 5965 | QueueObjects func(q); | 5965 | QueueObjects func(q); |
| 5966 | const bool firstonly = true; | 5966 | LLSelectMgr *mgr = LLSelectMgr::getInstance(); |
| 5967 | bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly); | 5967 | LLObjectSelectionHandle selectHandle = mgr->getSelection(); |
| 5968 | bool fail = selectHandle->applyToObjects(&func); | ||
| 5968 | if(fail) | 5969 | if(fail) |
| 5969 | { | 5970 | { |
| 5970 | if ( !func.scripted ) | 5971 | if ( !func.scripted ) |