livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release 

DEV-12326 DEV-12232 fix for strange string crashes.
web dataservices: fixed issue with non-selects not returning affected rows, also cleaned up log messages and unit tests
DEV-12232 fix for crash bug.
DEV-12105 Setting a music URL which is too long creates many problems
Adding streambase log message for login failures.
Changed URL for FetchInventoryDescendents to use new webservice when we're ready.
DEV-12140 - Mapserver crashes in 1.19.2 Server
QAR-390 - Add log_viewer_stats syslog writes
need to deploy vault_control.pl central services, for reg
DEV-11104 - Don't chew up memory profiling everything in pay-stipends.pl
web dataservices: minor changes: logging added, mailer host changed to localhost per Ops
master
Josh Bell 2008-03-21 01:28:52 +00:00
parent e3b97ac65b
commit 9fd4dfa572
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/message.xml
View File

@ -537,7 +537,7 @@
<boolean>false</boolean>
<key>EstateChangeInfo</key>
<boolean>false</boolean>
<boolean>true</boolean>
<key>FetchInventoryDescendents</key>
<boolean>true</boolean>

7
indra/llmessage/llurlrequest.cpp
View File

@ -64,6 +64,7 @@ public:
LLURLRequestDetail();
~LLURLRequestDetail();
std::string mURL;
std::string mProxy;
LLCurlEasyRequest* mCurlRequest;
LLBufferArray* mResponseBuffer;
LLChannelDescriptors mChannels;
@ -194,7 +195,11 @@ void LLURLRequest::useProxy(bool use_proxy)
void LLURLRequest::useProxy(const std::string &proxy)
{
curl_easy_setopt(mDetail->mCurlRequest, CURLOPT_PROXY, proxy.c_str());
mDetail->mProxy = proxy;
curl_easy_setopt(
mDetail->mCurlRequest,
CURLOPT_PROXY,
mDetail->mProxy.c_str());
}
// virtual