diff options
author | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
commit | af8653d7598418e929718ede6742589719ffb2fb (patch) | |
tree | 2744b56414fc48db5661ee11ce48ac5e8a26f021 /indra/llmessage | |
parent | 03dd09b1620b8331529f6aae742b2d341c29ce0d (diff) | |
parent | c8a36e9cfd1e90a1aa385667c7272c25e2ef9136 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llcircuit.h | 1 | ||||
-rw-r--r-- | indra/llmessage/lliohttpserver.cpp | 1 | ||||
-rw-r--r-- | indra/llmessage/llmessagetemplate.h | 1 | ||||
-rw-r--r-- | indra/llmessage/llpumpio.cpp | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmessage/llcircuit.h b/indra/llmessage/llcircuit.h index c46fd56acc..430d6358f7 100644 --- a/indra/llmessage/llcircuit.h +++ b/indra/llmessage/llcircuit.h @@ -40,7 +40,6 @@ #include "llpacketack.h" #include "lluuid.h" #include "llthrottle.h" -#include "llstat.h" // // Constants diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 74eaf9f025..20dc5ae968 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -42,7 +42,6 @@ #include "llpumpio.h" #include "llsd.h" #include "llsdserialize_xml.h" -#include "llstat.h" #include "llstl.h" #include "lltimer.h" diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index a2024166ee..ae8e0087c1 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -29,7 +29,6 @@ #include "lldarray.h" #include "message.h" // TODO: babbage: Remove... -#include "llstat.h" #include "llstl.h" class LLMsgVarData diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index fcb77a23a9..8272240ef4 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -36,7 +36,6 @@ #include "llapr.h" #include "llmemtype.h" #include "llstl.h" -#include "llstat.h" // These should not be enabled in production, but they can be // intensely useful during development for finding certain kinds of |