summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llassetstorage.cpp3
-rw-r--r--indra/llmessage/llcachename.cpp7
-rw-r--r--indra/llmessage/llcachename.h3
-rw-r--r--indra/llmessage/lldatapacker.cpp2
-rw-r--r--indra/llmessage/lldatapacker.h5
-rw-r--r--indra/llmessage/llnamevalue.h4
-rw-r--r--indra/llmessage/llpartdata.h2
-rw-r--r--indra/llmessage/llregionhandle.h2
-rw-r--r--indra/llmessage/lltransfersourcefile.h2
-rw-r--r--indra/llmessage/lltransfertargetfile.h2
-rw-r--r--indra/llmessage/llxfer_file.h2
-rw-r--r--indra/llmessage/llxfer_mem.h2
-rw-r--r--indra/llmessage/llxfer_vfile.h2
-rw-r--r--indra/llmessage/mean_collision_data.h2
-rw-r--r--indra/llmessage/message.cpp8
-rw-r--r--indra/llmessage/message.h2
-rw-r--r--indra/llmessage/net.cpp1
17 files changed, 3 insertions, 48 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index b5a9e8a727..b848b6488a 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -9,11 +9,8 @@
#include "linden_common.h"
// system library includes
-#include <stdlib.h>
-#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <algorithm>
#include "llassetstorage.h"
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index f1d2925026..ba3a927e92 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -10,13 +10,6 @@
#include "llcachename.h"
-// system includes
-#include <string.h> // strcpy
-#include <time.h>
-#include <algorithm>
-#include <functional>
-#include <map>
-
// linden library includes
#include "message.h"
#include "llrand.h"
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 3c8a6587b1..5580c314c0 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -9,9 +9,6 @@
#ifndef LL_LLCACHENAME_H
#define LL_LLCACHENAME_H
-// Forward declarations
-#include <stdio.h>
-
class LLMessageSystem;
class LLHost;
class LLUUID;
diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp
index 74a6a871c0..2d1822a337 100644
--- a/indra/llmessage/lldatapacker.cpp
+++ b/indra/llmessage/lldatapacker.cpp
@@ -6,8 +6,6 @@
* $License$
*/
-#include <string.h>
-
#include "linden_common.h"
#include "lldatapacker.h"
diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h
index 01c3ebb347..b288ec67dd 100644
--- a/indra/llmessage/lldatapacker.h
+++ b/indra/llmessage/lldatapacker.h
@@ -9,11 +9,6 @@
#ifndef LL_LLDATAPACKER_H
#define LL_LLDATAPACKER_H
-#include <stdio.h>
-#include <iostream>
-
-#include "llerror.h"
-
class LLColor4;
class LLColor4U;
class LLVector2;
diff --git a/indra/llmessage/llnamevalue.h b/indra/llmessage/llnamevalue.h
index f3d0d0d338..82217f700e 100644
--- a/indra/llmessage/llnamevalue.h
+++ b/indra/llmessage/llnamevalue.h
@@ -9,13 +9,9 @@
#ifndef LL_LLNAMEVALUE_H
#define LL_LLNAMEVALUE_H
-#include <iostream>
-#include <string.h>
-
#include "string_table.h"
#include "llskipmap.h"
#include "llmath.h"
-//#include "vmath.h"
#include "v3math.h"
#include "lldbstrings.h"
diff --git a/indra/llmessage/llpartdata.h b/indra/llmessage/llpartdata.h
index 662d635a08..18e049ae7a 100644
--- a/indra/llmessage/llpartdata.h
+++ b/indra/llmessage/llpartdata.h
@@ -9,8 +9,6 @@
#ifndef LL_LLPARTDATA_H
#define LL_LLPARTDATA_H
-#include <stdio.h>
-
#include "lluuid.h"
#include "v3math.h"
#include "v3dmath.h"
diff --git a/indra/llmessage/llregionhandle.h b/indra/llmessage/llregionhandle.h
index 41d104231c..8238579262 100644
--- a/indra/llmessage/llregionhandle.h
+++ b/indra/llmessage/llregionhandle.h
@@ -9,8 +9,6 @@
#ifndef LL_LLREGIONHANDLE_H
#define LL_LLREGIONHANDLE_H
-#include <math.h>
-
#include "indra_constants.h"
#include "v3math.h"
#include "v3dmath.h"
diff --git a/indra/llmessage/lltransfersourcefile.h b/indra/llmessage/lltransfersourcefile.h
index fcb5743fb5..eb0ff6f777 100644
--- a/indra/llmessage/lltransfersourcefile.h
+++ b/indra/llmessage/lltransfersourcefile.h
@@ -11,8 +11,6 @@
#include "lltransfermanager.h"
-#include <stdio.h>
-
class LLTransferSourceParamsFile : public LLTransferSourceParams
{
public:
diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h
index eb000e527e..628bce7e3f 100644
--- a/indra/llmessage/lltransfertargetfile.h
+++ b/indra/llmessage/lltransfertargetfile.h
@@ -11,8 +11,6 @@
#include "lltransfermanager.h"
-#include <stdio.h>
-
typedef void (*LLTTFCompleteCallback)(const LLTSCode status, void *user_data);
class LLTransferTargetParamsFile : public LLTransferTargetParams
diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
index 38c94f6591..80f6526dd7 100644
--- a/indra/llmessage/llxfer_file.h
+++ b/indra/llmessage/llxfer_file.h
@@ -9,8 +9,6 @@
#ifndef LL_LLXFER_FILE_H
#define LL_LLXFER_FILE_H
-#include <stdio.h>
-
#include "llxfer.h"
#include "lldir.h"
diff --git a/indra/llmessage/llxfer_mem.h b/indra/llmessage/llxfer_mem.h
index 6577132c9b..05a38af7b7 100644
--- a/indra/llmessage/llxfer_mem.h
+++ b/indra/llmessage/llxfer_mem.h
@@ -9,8 +9,6 @@
#ifndef LL_LLXFER_MEM_H
#define LL_LLXFER_MEM_H
-#include <stdio.h>
-
#include "message.h"
#include "lltimer.h"
#include "llxfer.h"
diff --git a/indra/llmessage/llxfer_vfile.h b/indra/llmessage/llxfer_vfile.h
index a5dce0352c..552f05ce77 100644
--- a/indra/llmessage/llxfer_vfile.h
+++ b/indra/llmessage/llxfer_vfile.h
@@ -9,8 +9,6 @@
#ifndef LL_LLXFER_VFILE_H
#define LL_LLXFER_VFILE_H
-#include <stdio.h>
-
#include "llxfer.h"
#include "llassetstorage.h"
diff --git a/indra/llmessage/mean_collision_data.h b/indra/llmessage/mean_collision_data.h
index 7d3f90cde6..48df699561 100644
--- a/indra/llmessage/mean_collision_data.h
+++ b/indra/llmessage/mean_collision_data.h
@@ -10,8 +10,8 @@
#ifndef LL_MEAN_COLLISIONS_DATA_H
#define LL_MEAN_COLLISIONS_DATA_H
-#include <time.h>
#include "lldbstrings.h"
+#include "lluuid.h"
const F32 MEAN_COLLISION_TIMEOUT = 5.f;
const S32 MAX_MEAN_COLLISIONS = 5;
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 5077354533..7f9f440c80 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -18,10 +18,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <cstring>
-#include <time.h>
#include <iomanip>
#include <iterator>
#include <sstream>
@@ -355,8 +351,8 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
return;
}
- LLString template_body;
- if(!LLString::read(template_body, filename))
+ std::string template_body;
+ if(!_read_file_into_string(template_body, filename))
{
llwarns << "Failed to open template: " << filename << llendl;
mbError = TRUE;
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 2f875f2b96..04bc058cb6 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -10,8 +10,6 @@
#define LL_MESSAGE_H
#include <cstring>
-#include <stdio.h>
-#include <map>
#include <set>
#if LL_LINUX
diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp
index 2d3215f47c..615af0915a 100644
--- a/indra/llmessage/net.cpp
+++ b/indra/llmessage/net.cpp
@@ -12,7 +12,6 @@
// system library includes
#include <stdexcept>
-#include <stdio.h>
#if LL_WINDOWS
#define WIN32_LEAN_AND_MEAN
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:30:23 +0000