diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:29:40 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:29:40 +0300 |
| commit | eca82d7308cbbb3d6c39bb125d261a44604759ba (patch) | |
| tree | 65657ad801985ac710fdbed8e086b9a7d66df9a9 /indra/newview/llchathistory.cpp | |
| parent | beb6181863bbce18ff7f408014e02a1086bc9711 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 9a608fba8e..43dc10ef5f 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -82,7 +82,7 @@ public: // requests will be throttled from a non-trusted browser LLObjectIMHandler() : LLCommandHandler("objectim", UNTRUSTED_THROTTLE) {} - bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) + bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) { if (params.size() < 1) { |