summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2022-04-06 17:34:28 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-07-13 12:34:31 -0400
commitee7fc1d14b1a9b677129bb20714b79343a3bad94 (patch)
tree5799b9d1d268f3dc9303d2782f5fec95ed926bd7 /indra
parentcc3d21cceac7d6c1b2fc9297330fa819855f6e5b (diff)
DRTVWR-558: Change LLEventDispatcher error action (also LLEventAPI).
Originally the LLEventAPI mechanism was primarily used for VITA testing. In that case it was okay for the viewer to crash with LL_ERRS if the test script passed a bad request. With puppetry, hopefully new LEAP scripts will be written to engage LLEventAPIs in all sorts of interesting ways. Change error handling from LL_ERRS to LL_WARNS. Furthermore, if the incoming request contains a "reply" key, send back an error response to the requester. Update lleventdispatcher_test.cpp accordingly. (cherry picked from commit de0539fcbe815ceec2041ecc9981e3adf59f2806) (cherry picked from commit 4b60941952e97691f11806062f4bc66dd5ac8dae)
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/lleventdispatcher.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
index cf88dced12..09b786b69e 100644
--- a/indra/llcommon/lleventdispatcher.h
+++ b/indra/llcommon/lleventdispatcher.h
@@ -325,6 +325,7 @@ private:
CLASS* downcast = static_cast<CLASS*>(this);
add(name, desc, boost::bind(method, downcast, _1), required);
}
+ void addFail(const std::string& name, const std::string& classname) const;
std::string try_call_log(const std::string& key, const std::string& name,
const LLSD& event) const;
std::string try_call(const std::string& key, const std::string& name,