diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-05-17 11:17:48 -0700 |
| commit | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (patch) | |
| tree | 0c9b22edca280d8e2a2ef280360485c139c9b829 /indra/newview/lleventpoll.cpp | |
| parent | 4758355c599d1487c11884d3f700981e011cb7b7 (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
| -rw-r--r-- | indra/newview/lleventpoll.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 6f3f6e9166..26782e53f0 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -247,8 +247,9 @@ namespace Details errorCount = 0; if (!result.isMap() || - !result.get("events") || - !result.get("id")) + !result.has("events") || + !result["events"].isArray() || + !result.has("id")) { LL_WARNS("LLEventPollImpl") << " <" << counter << "> received event poll with no events or id key: " << result << LL_ENDL; continue; |