From 31f7f6c0018ecbbc55986035e935f5e42a33ff16 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 7 Mar 2008 17:26:51 +0000 Subject: svn merge -r 80990:81720 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release Reg-api merge is the bulk of the diff, it's actually not so bad. Change summary: * Fixed a bogus HTTP/curl warning and cleaned up one line of code for clarity * extra '.' in FQDN names/extra . in the non-FQDN case, which is a syntax error * DEV-11542 Joining two parcels destroys search relevance of a store. * Fixed bug preventing users who turn off email notification from getting offline messages at login * Updated version numbers * New reg-api (w00t!) * DEV-11427 / DEV-11399 - LSL slowdown from strncpy buffer-clearing overhead * DEV-11359 Hide music URL should be on by default * Update to r89 of eventlet * QAR-347 "SEC-28 - It is possible to rez any object, whether you own it or not." * QAR-336 Additional logging to track teleport failures * DEV-11397 - use the slave db for read queries for crons * Fix to turn off PEAR debug logging * Copied code from eventlet.coros to make an Updater that won't die so easily. (multiagent-chat) * Various chicanery with dir-find query * Emergency fix for bad FORCE INDEX on user table when actually searching on the user_last_name table * DEV-11124 : Modify backbone service proxy so that we know which web-ds host a dataservice is actually called * Fixes for DEV-5883 : Test improved-instant-message --- indra/newview/lltexturefetch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 9464146742..008eaccdc4 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -91,7 +91,7 @@ private: LLUUID mID; }; - class HTTPGetResponder : public LLCurl::Responder + class HTTPGetResponder : public LLHTTPClient::Responder { public: HTTPGetResponder(LLTextureFetch* fetcher, const LLUUID& id) -- cgit v1.2.3