From 18af6baeddc09b5c31212edc1e6a4c534519529f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 27 Mar 2011 18:50:04 -0500
Subject: [PATCH] Cleaned up a few minor things

---
 indra/llcommon/llchat.h        | 3 +--
 indra/llcommon/llerror.cpp     | 3 ---
 indra/llcommon/llsdserialize.h | 5 +++--
 indra/llvfs/lllfsthread.cpp    | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h
index 62b5091a9..323b3b3c0 100644
--- a/indra/llcommon/llchat.h
+++ b/indra/llcommon/llchat.h
@@ -34,7 +34,6 @@
 #ifndef LL_LLCHAT_H
 #define LL_LLCHAT_H
 
-#include "llstring.h"
 #include "lluuid.h"
 #include "v3math.h"
 
@@ -71,7 +70,7 @@ typedef enum e_chat_audible_level
 class LLChat
 {
 public:
-	LLChat(const std::string& text = LLStringUtil::null)
+	LLChat(const std::string& text = std::string())
 	:	mText(text),
 		mFromName(),
 		mFromID(),
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index e61ed721e..e549979f0 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -45,9 +45,6 @@
 # include <syslog.h>
 # include <unistd.h>
 #endif // !LL_WINDOWS
-#if LL_WINDOWS
-# include <windows.h>
-#endif // LL_WINDOWS
 #include <vector>
 
 #include "llapp.h"
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index a01b6dcd3..7dd2603eb 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -639,7 +639,7 @@ protected:
  *  </code>
  */
 template <class Formatter>
-class LLSDOStreamer : public Formatter
+class LLSDOStreamer
 {
 public:
 	/** 
@@ -660,7 +660,8 @@ public:
 		std::ostream& str,
 		const LLSDOStreamer<Formatter>& formatter)
 	{
-		formatter.format(formatter.mSD, str, formatter.mOptions);
+		LLPointer<Formatter> f = new Formatter;
+		f->format(formatter.mSD, str, formatter.mOptions);
 		return str;
 	}
 
diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp
index cd9122060..69c7eb6d6 100644
--- a/indra/llvfs/lllfsthread.cpp
+++ b/indra/llvfs/lllfsthread.cpp
@@ -184,7 +184,7 @@ bool LLLFSThread::Request::processRequest()
 	if (mOperation ==  FILE_READ)
 	{
 		llassert(mOffset >= 0);
-		LLAPRFile infile ;
+		LLAPRFile infile ; // auto-closes
 		infile.open(mFileName, LL_APR_RB, LLAPRFile::local);
 		if (!infile.getFileHandle())
 		{
@@ -200,7 +200,6 @@ bool LLLFSThread::Request::processRequest()
 		llassert_always(off >= 0);
 		mBytesRead = infile.read(mBuffer, mBytes );
 		complete = true;
-		infile.close() ;
 // 		llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl;
 	}
 	else if (mOperation ==  FILE_WRITE)