diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-12-13 00:19:53 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-12-13 00:19:53 +0200 |
commit | c32a970cea6390ca037aace33bf546da5bfb9b97 (patch) | |
tree | b9322617e8d870afbf581e141f5c9a26c60d6861 /indra/newview/llviewermessage.h | |
parent | 39805cd97882ffb0f93a7d4fb07a6445327ef6cf (diff) | |
parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewermessage.h')
-rw-r--r-- | indra/newview/llviewermessage.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index 2d6636f30d..78829a6a56 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -254,7 +254,7 @@ public: /*virtual*/ void fromLLSD(const LLSD& params); /*virtual*/ void handleRespond(const LLSD& notification, const LLSD& response); - void send_auto_receive_response(void); + void send_auto_receive_response() { sendReceiveResponse(true, mFolderID); } // TODO - replace all references with handleRespond() bool inventory_offer_callback(const LLSD& notification, const LLSD& response); @@ -264,6 +264,7 @@ private: void initRespondFunctionMap(); std::string getSanitizedDescription(); + void sendReceiveResponse(bool accept, const LLUUID &destination_folder_id); typedef boost::function<bool (const LLSD&, const LLSD&)> respond_function_t; typedef std::map<std::string, respond_function_t> respond_function_map_t; |