merge release@82858 maint-render-2-merge@83010 -> release

QAR-389

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
index 7a1542a6fa..da1ad6a34e 100644
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -127,7 +127,7 @@ public:
 	typedef std::basic_ios<char,std::char_traits < char > > _Myios;
 
 	llofstream()
-		: std::basic_ostream<char,std::char_traits < char > >(NULL,true),_Filebuffer(NULL)
+		: std::basic_ostream<char,std::char_traits < char > >(NULL,true),_Filebuffer(NULL),_ShouldClose(false)
 	{	// construct unopened
 	}
 
@@ -138,7 +138,8 @@ public:
 
 	explicit llofstream(_Filet *_File)
 		: std::basic_ostream<char,std::char_traits < char > >(NULL,true),
-			_Filebuffer(new _Myfb(_File))//_File)
+			_Filebuffer(new _Myfb(_File)),//_File)
+			_ShouldClose(false)
 	{	// construct with specified C stream
 	}
 
@@ -157,6 +158,7 @@ public:
 
 private:
 	_Myfb *_Filebuffer;	// the file buffer
+	bool _ShouldClose;
 };