diff options
| author | Jacek Antonelli | 2009-04-06 01:51:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-04-06 01:52:15 -0500 |
| commit | bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937 (patch) | |
| tree | 7b2154384c2d1339c6c030e237e3ea6ba7e19e94 /linden/indra/newview/llviewermenu.cpp | |
| parent | Changed the login splash screen URL. (diff) | |
| parent | Merge branch gst-thread into gst-revamp (diff) | |
| download | meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.zip meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.gz meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.bz2 meta-impy-bcf93cd3a302fd4cc1f8cf82c47a5b863dc2d937.tar.xz | |
Merge branch 'gst-revamp' into next
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 ) |