diff options
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llcapabilitylistener.cpp | 1 | ||||
-rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llcapabilitylistener.cpp b/indra/newview/llcapabilitylistener.cpp index 3277da8930..0a41ad614e 100644 --- a/indra/newview/llcapabilitylistener.cpp +++ b/indra/newview/llcapabilitylistener.cpp @@ -90,6 +90,7 @@ bool LLCapabilityListener::capListener(const LLSD& request) // This capability is supported by the region to which we're talking. LLHTTPClient::post(url, payload, new LLSDMessage::EventResponder(LLEventPumps::instance(), + request, mProvider.getDescription(), cap, reply, error), LLSD(), // headers diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 2821e6c59f..71e2427c99 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -217,6 +217,7 @@ public: /// populate an XMLRPC_REQUEST and an associated LLXMLRPCTransaction. Send /// the request. Poller(const LLSD& command): + mReqID(command), mUri(command["uri"]), mMethod(command["method"]), mReplyPump(command["reply"]) @@ -325,7 +326,7 @@ public: curlcode = CURLcode(curlint); } - LLSD data; + LLSD data(mReqID.makeResponse()); data["status"] = sStatusMapper.lookup(status); data["errorcode"] = sCURLcodeMapper.lookup(curlcode); data["error"] = ""; @@ -476,6 +477,7 @@ private: return responses; } + const LLReqID mReqID; const std::string mUri; const std::string mMethod; const std::string mReplyPump; |