[NOTE: This was an erroneous commit, and was reverted in the next revision]

QAR-369 - viewer-cleanup2-7 81916 merged into release.

3 files changed, 8 insertions, 12 deletions

diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index a0fb086029..89b276e3b3 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -339,7 +339,7 @@ const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
 
 // Crash reporter behavior
-const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
+const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml";
 const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
diff --git a/indra/llcommon/llevent.h b/indra/llcommon/llevent.h
index 8ba883a0ee..741b40b787 100644
--- a/indra/llcommon/llevent.h
+++ b/indra/llcommon/llevent.h
@@ -185,13 +185,6 @@ protected:
 	LLPointer<LLEventDispatcher> mDispatcher;
 };
 
-// Utility mixer class which fires & handles events
-class LLSimpleListenerObservable : public LLObservable, public LLSimpleListener
-{
-public:
-	virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) = 0;
-};
-
 class LLValueChangedEvent : public LLEvent
 {
 public:
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index 2a18e5c64c..c44650009d 100644
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -271,9 +271,11 @@ void llofstream::open(const char* _Filename,	/* Flawfinder: ignore */
 
 void llofstream::close()
 {	// close the C stream
-	llassert(_Filebuffer);
-	if (_Filebuffer->close() == 0)
-		_Myios::setstate(ios_base::failbit);	/*Flawfinder: ignore*/
+	if(is_open())
+	{
+		if (_Filebuffer->close() == 0)
+			_Myios::setstate(ios_base::failbit);	/*Flawfinder: ignore*/
+	}
 }
 
 llofstream::llofstream(const char *_Filename,
@@ -285,7 +287,8 @@ llofstream::llofstream(const char *_Filename,
 }
 
 llofstream::~llofstream()
-{	// destroy the object
+{	
+	// destroy the object
 	close();
 	delete _Filebuffer;
 }