Skip to content
Snippets Groups Projects
Commit dc2684fa authored by Josh Bell's avatar Josh Bell
Browse files

svn merge -r 76923:76933...

svn merge -r 76923:76933 svn+ssh://svn.lindenlab.com/svn/linden/branches/improved-im-for-merge --> release

QAR-176 merge of Improved IM into Release
parent e1d40972
No related branches found
No related tags found
No related merge requests found
...@@ -827,7 +827,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl( ...@@ -827,7 +827,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
} }
else else
{ {
llinfos << "LLHTTPResponder::process_impl didn't find a node for " llwarns << "LLHTTPResponder::process_impl didn't find a node for "
<< mAbsPathAndQuery << llendl; << mAbsPathAndQuery << llendl;
LLBufferStream str(channels, buffer.get()); LLBufferStream str(channels, buffer.get());
mState = STATE_SHORT_CIRCUIT; mState = STATE_SHORT_CIRCUIT;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment