diff options
author | Jacek Antonelli | 2009-04-06 01:29:22 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-06 01:29:22 -0500 |
commit | e06d504a68a72c321794b5e8740ccefcc45f654b (patch) | |
tree | 24d844d82b77957e763e6bc9a3103e29aa77f5f3 /linden/indra/newview/llviewermenu.cpp | |
parent | Apply saved MediaDebugLevel at media init time. (diff) | |
parent | Cleaned up logic for bad streams (diff) | |
download | meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.zip meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.gz meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.bz2 meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.xz |
Merge commit 'mccabe/gst-revamp' into gst-revamp
Diffstat (limited to '')
-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 ) |