diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
commit | 77dc594e79118769087c0e2094c303fc5aaea5d4 (patch) | |
tree | ed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llmessage/lliohttpserver.h | |
parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
parent | 1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff) |
merge back late changes and tags from release branch
Diffstat (limited to 'indra/llmessage/lliohttpserver.h')
-rw-r--r-- | indra/llmessage/lliohttpserver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/lliohttpserver.h b/indra/llmessage/lliohttpserver.h index 2294e4b8ae..5c1b0531ff 100644 --- a/indra/llmessage/lliohttpserver.h +++ b/indra/llmessage/lliohttpserver.h @@ -50,7 +50,7 @@ class LLIOHTTPServer public: typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data); - static LLHTTPNode& create(LLPumpIO& pump, U16 port); + static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port); /**< Creates an HTTP wire server on the pump for the given TCP port. * * Returns the root node of the new server. Add LLHTTPNode instances |