diff options
Diffstat (limited to 'linden/indra/llmessage/llhttpassetstorage.h')
-rw-r--r-- | linden/indra/llmessage/llhttpassetstorage.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h index 71e973a..585b281 100644 --- a/linden/indra/llmessage/llhttpassetstorage.h +++ b/linden/indra/llmessage/llhttpassetstorage.h | |||
@@ -48,15 +48,15 @@ class LLHTTPAssetStorage : public LLAssetStorage | |||
48 | public: | 48 | public: |
49 | LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, | 49 | LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, |
50 | LLVFS *vfs, const LLHost &upstream_host, | 50 | LLVFS *vfs, const LLHost &upstream_host, |
51 | const char *web_host, | 51 | const std::string& web_host, |
52 | const char *local_web_host, | 52 | const std::string& local_web_host, |
53 | const char *host_name); | 53 | const std::string& host_name); |
54 | 54 | ||
55 | LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, | 55 | LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, |
56 | LLVFS *vfs, | 56 | LLVFS *vfs, |
57 | const char *web_host, | 57 | const std::string& web_host, |
58 | const char *local_web_host, | 58 | const std::string& local_web_host, |
59 | const char *host_name); | 59 | const std::string& host_name); |
60 | 60 | ||
61 | 61 | ||
62 | virtual ~LLHTTPAssetStorage(); | 62 | virtual ~LLHTTPAssetStorage(); |
@@ -74,7 +74,7 @@ public: | |||
74 | F64 timeout=LL_ASSET_STORAGE_TIMEOUT); | 74 | F64 timeout=LL_ASSET_STORAGE_TIMEOUT); |
75 | 75 | ||
76 | virtual void storeAssetData( | 76 | virtual void storeAssetData( |
77 | const char* filename, | 77 | const std::string& filename, |
78 | const LLUUID& asset_id, | 78 | const LLUUID& asset_id, |
79 | LLAssetType::EType atype, | 79 | LLAssetType::EType atype, |
80 | LLStoreAssetCallback callback, | 80 | LLStoreAssetCallback callback, |
@@ -99,7 +99,7 @@ public: | |||
99 | // Hack. One off curl download an URL to a file. Probably should be elsewhere. | 99 | // Hack. One off curl download an URL to a file. Probably should be elsewhere. |
100 | // Only used by lldynamicstate. The API is broken, and should be replaced with | 100 | // Only used by lldynamicstate. The API is broken, and should be replaced with |
101 | // a generic HTTP file fetch - Doug 9/25/06 | 101 | // a generic HTTP file fetch - Doug 9/25/06 |
102 | S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata); | 102 | S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const std::string &url, const std::string& filename, progress_callback callback, void *userdata); |
103 | 103 | ||
104 | LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running); | 104 | LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running); |
105 | 105 | ||
@@ -135,7 +135,7 @@ protected: | |||
135 | void *user_data, BOOL duplicate, BOOL is_priority); | 135 | void *user_data, BOOL duplicate, BOOL is_priority); |
136 | 136 | ||
137 | private: | 137 | private: |
138 | void _init(const char *web_host, const char *local_web_host, const char* host_name); | 138 | void _init(const std::string& web_host, const std::string& local_web_host, const std::string& host_name); |
139 | 139 | ||
140 | // This will return the correct base URI for any http asset request | 140 | // This will return the correct base URI for any http asset request |
141 | std::string getBaseURL(const LLUUID& asset_id, LLAssetType::EType asset_type); | 141 | std::string getBaseURL(const LLUUID& asset_id, LLAssetType::EType asset_type); |