diff options
Diffstat (limited to 'linden/indra/llmessage/lliohttpserver.cpp')
-rw-r--r-- | linden/indra/llmessage/lliohttpserver.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp index 83dfa94..8ad052b 100644 --- a/linden/indra/llmessage/lliohttpserver.cpp +++ b/linden/indra/llmessage/lliohttpserver.cpp | |||
@@ -948,13 +948,9 @@ private: | |||
948 | 948 | ||
949 | 949 | ||
950 | // static | 950 | // static |
951 | LLHTTPNode& LLIOHTTPServer::create( | 951 | LLHTTPNode& LLIOHTTPServer::create(LLPumpIO& pump, U16 port) |
952 | apr_pool_t* pool, LLPumpIO& pump, U16 port) | ||
953 | { | 952 | { |
954 | LLSocket::ptr_t socket = LLSocket::create( | 953 | LLSocket::ptr_t socket = LLSocket::create(LLSocket::STREAM_TCP, port); |
955 | pool, | ||
956 | LLSocket::STREAM_TCP, | ||
957 | port); | ||
958 | if(!socket) | 954 | if(!socket) |
959 | { | 955 | { |
960 | llerrs << "Unable to initialize socket" << llendl; | 956 | llerrs << "Unable to initialize socket" << llendl; |
@@ -963,7 +959,7 @@ LLHTTPNode& LLIOHTTPServer::create( | |||
963 | LLHTTPResponseFactory* factory = new LLHTTPResponseFactory; | 959 | LLHTTPResponseFactory* factory = new LLHTTPResponseFactory; |
964 | boost::shared_ptr<LLChainIOFactory> factory_ptr(factory); | 960 | boost::shared_ptr<LLChainIOFactory> factory_ptr(factory); |
965 | 961 | ||
966 | LLIOServerSocket* server = new LLIOServerSocket(pool, socket, factory_ptr); | 962 | LLIOServerSocket* server = new LLIOServerSocket(socket, factory_ptr); |
967 | 963 | ||
968 | LLPumpIO::chain_t chain; | 964 | LLPumpIO::chain_t chain; |
969 | chain.push_back(LLIOPipe::ptr_t(server)); | 965 | chain.push_back(LLIOPipe::ptr_t(server)); |