diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/llmessage/lliohttpserver.h | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/llmessage/lliohttpserver.h')
| -rw-r--r-- | linden/indra/llmessage/lliohttpserver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmessage/lliohttpserver.h b/linden/indra/llmessage/lliohttpserver.h index d1c9bdd..d2a8e2a 100644 --- a/linden/indra/llmessage/lliohttpserver.h +++ b/linden/indra/llmessage/lliohttpserver.h | |||
| @@ -57,7 +57,7 @@ class LLIOHTTPServer | |||
| 57 | public: | 57 | public: |
| 58 | typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data); | 58 | typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data); |
| 59 | 59 | ||
| 60 | static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port); | 60 | static LLHTTPNode& create(LLPumpIO& pump, U16 port); |
| 61 | /**< Creates an HTTP wire server on the pump for the given TCP port. | 61 | /**< Creates an HTTP wire server on the pump for the given TCP port. |
| 62 | * | 62 | * |
| 63 | * Returns the root node of the new server. Add LLHTTPNode instances | 63 | * Returns the root node of the new server. Add LLHTTPNode instances |