diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-01-09 10:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 10:40:45 -0500 |
| commit | 8a7ac72e46bdb82814e167dfc09057edf4453eb1 (patch) | |
| tree | 3e3e8fb541f6e4f1db70abd4a6bfd1f554fe2b2a /indra | |
| parent | 9cfe9e8f78a22d78004d1549bfaaf313bc645e1a (diff) | |
| parent | f31dc5aa78887c48391bc98313d56013411c3167 (diff) | |
Merge pull request #13 from secondlife/DRTVWR-589-alt-fix
DRTVWR-589: Fix build errors resulting from merge with main.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lleventdispatcher.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/tests/lleventdispatcher_test.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h index a82bc7a69b..35bf9075a0 100644 --- a/indra/llcommon/lleventdispatcher.h +++ b/indra/llcommon/lleventdispatcher.h @@ -851,6 +851,8 @@ public: ARGS&&... args); virtual ~LLDispatchListener() {} + std::string getPumpName() const { return getName(); } + private: bool process(const LLSD& event) const; void call_one(const LLSD& name, const LLSD& event) const; diff --git a/indra/llcommon/tests/lleventdispatcher_test.cpp b/indra/llcommon/tests/lleventdispatcher_test.cpp index b0c532887c..244cd07ac9 100644 --- a/indra/llcommon/tests/lleventdispatcher_test.cpp +++ b/indra/llcommon/tests/lleventdispatcher_test.cpp @@ -17,13 +17,13 @@ // std headers // external library headers // other Linden headers +#include "StringVec.h" #include "../test/lltut.h" #include "lleventfilter.h" #include "llsd.h" #include "llsdutil.h" #include "llevents.h" #include "stringize.h" -#include "StringVec.h" #include "tests/wrapllerrs.h" #include "../test/catch_and_store_what_in.h" #include "../test/debug.h" |