diff options
author | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
commit | 7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch) | |
tree | 67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llfloaterimnearbychat.cpp | |
parent | 5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff) | |
parent | 33e0766ee08cccb480675a75d83b3a6e78849906 (diff) |
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 0d2c6d8e4c..bb4cc9bca3 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -903,8 +903,10 @@ public: LLChatCommandHandler() : LLCommandHandler("chat", UNTRUSTED_BLOCK) { } // Your code here - bool handle(const LLSD& tokens, const LLSD& query_map, - LLMediaCtrl* web) + bool handle(const LLSD& tokens, + const LLSD& query_map, + const std::string& grid, + LLMediaCtrl* web) { bool retval = false; // Need at least 2 tokens to have a valid message. |