1 files changed, 15 insertions, 17 deletions
diff --git a/indra/newview/scripts/lua/ErrorQueue.lua b/indra/newview/scripts/lua/ErrorQueue.lua
index e6279f8411..db7022661e 100644
--- a/indra/newview/scripts/lua/ErrorQueue.lua
+++ b/indra/newview/scripts/lua/ErrorQueue.lua
@@ -1,32 +1,30 @@
 -- ErrorQueue isa WaitQueue with the added feature that a producer can push an
--- error through the queue. When that error is dequeued, the consumer will
--- throw that error.
+-- error through the queue. Once that error is dequeued, every consumer will
+-- raise that error.
 
 local WaitQueue = require('WaitQueue')
 
 ErrorQueue = WaitQueue:new()
 
-function ErrorQueue:Enqueue(value)
-    -- normal value, not error
-    WaitQueue:Enqueue({ false, value })
-end
-
 function ErrorQueue:Error(message)
-    -- flag this entry as an error message
-    WaitQueue:Enqueue({ true, message })
+    -- Setting Error() is a marker, like closing the queue. Once we reach the
+    -- error, every subsequent Dequeue() call will raise the same error.
+    self._closed = message
+    self:_wake_waiters()
 end
 
 function ErrorQueue:Dequeue()
-    local errflag, value = table.unpack(WaitQueue:Dequeue())
-    if errflag == nil then
-        -- queue has been closed, tell caller
-        return nil
+    local value = WaitQueue.Dequeue(self)
+    if value ~= nil then
+        -- queue not yet closed, show caller
+        return value
     end
-    if errflag then
-        -- 'value' is a message pushed by Error()
-        error(value)
+    if self._closed == true then
+        -- WaitQueue:close() sets true: queue has only been closed, tell caller
+        return nil
     end
-    return value
+    -- self._closed is a message set by Error()
+    error(self._closed)
 end
 
 return ErrorQueue