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

Merge up to 26018 / 0b3f2b257f95 (FS tip).

meow-7.2.2
Nicky 2012-01-21 18:10:14 +01:00
parent e143ed273f f391ec3678
commit 4cc05f3e3b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/llmessage/llurlrequest.cpp
View File

@ -84,8 +84,15 @@ LLURLRequestDetail::LLURLRequestDetail() :
LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
mCurlRequest = new LLCurlEasyRequest();
if(!mCurlRequest)
{
lldebugs << "failed to allocate new curl request." << llendl;
return;
}
if(!mCurlRequest->isValid()) //failed.
{
lldebugs << "new curl request is not valid." << llendl;
delete mCurlRequest ;
mCurlRequest = NULL ;
}
@ -269,7 +276,7 @@ void LLURLRequest::setModifiedSince(const time_t &if_modified_since)
//virtual
bool LLURLRequest::isValid()
{
return mDetail->mCurlRequest && mDetail->mCurlRequest->isValid();
return mDetail && mDetail->mCurlRequest && mDetail->mCurlRequest->isValid();
}
// virtual
@ -469,6 +476,18 @@ void LLURLRequest::initialize()
LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
mState = STATE_INITIALIZED;
mDetail = new LLURLRequestDetail;
if(!mDetail)
{
lldebugs << "LLURLRequestDetail() failed." << llendl;
return;
}
if(!mDetail->mCurlRequest)
{
lldebugs << "mCurlRequest==0!" << llendl;
return;
}
mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);

1
indra/newview/llvovolume.h
View File

@ -131,6 +131,7 @@ public:
/*virtual*/ const LLMatrix4 getRenderMatrix() const;
typedef std::map<LLUUID, S32> texture_cost_t;
U32 getRenderCost(texture_cost_t &textures) const;
F32 getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_value) const;
/*virtual*/ F32 getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL) { return getStreamingCost(bytes, visible_bytes, NULL); }