diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/llmessage | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llinstantmessage.h | 2 | ||||
| -rw-r--r-- | indra/llmessage/lliohttpserver.cpp | 8 | ||||
| -rw-r--r-- | indra/llmessage/llregionflags.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h index abb1651faf..9645d4a763 100644 --- a/indra/llmessage/llinstantmessage.h +++ b/indra/llmessage/llinstantmessage.h @@ -177,7 +177,7 @@ enum EGodlikeRequest GOD_WANTS_NOTHING, // for requesting physics information about an object - GOD_WANTS_HAVOK_INFO, + GOD_WANTS_PHYSICS_INFO, // two unused requests that can be appropriated for debug // purposes (no viewer recompile necessary) diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 625dbb68b9..ec5cb93d69 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -203,7 +203,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl( } // Log all HTTP transactions. - llinfos << verb << " " << context[CONTEXT_REQUEST]["path"].asString() + // TODO: Add a way to log these to their own file instead of indra.log + // It is just too spammy to be in indra.log. + lldebugs << verb << " " << context[CONTEXT_REQUEST]["path"].asString() << " " << mStatusCode << " " << mStatusMessage << " " << delta << "s" << llendl; @@ -723,8 +725,8 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl( const LLHTTPNode* node = mRootNode.traverse(mPath, context); if(node) { - lldebugs << "LLHTTPResponder::process_impl found node for " - << mAbsPathAndQuery << llendl; + //llinfos << "LLHTTPResponder::process_impl found node for " + // << mAbsPathAndQuery << llendl; // Copy everything after mLast read to the out. LLBufferArray::segment_iterator_t seg_iter; diff --git a/indra/llmessage/llregionflags.h b/indra/llmessage/llregionflags.h index 65d76bba28..aa9964d46b 100644 --- a/indra/llmessage/llregionflags.h +++ b/indra/llmessage/llregionflags.h @@ -140,7 +140,7 @@ const U32 ESTATE_MAINLAND = 1; const U32 ESTATE_ORIENTATION = 2; const U32 ESTATE_INTERNAL = 3; const U32 ESTATE_SHOWCASE = 4; -const U32 ESTATE_KIDGRID = 5; +const U32 ESTATE_TEEN = 5; const U32 ESTATE_LAST_LINDEN = 5; // last linden owned/managed estate // for EstateOwnerRequest, setaccess message |