Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

1 files changed, 5 insertions, 4 deletions

diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 2a6353fe2e..605718d40b 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -36,13 +36,14 @@ LLAgentPilot::~LLAgentPilot()
 
 void LLAgentPilot::load(const char *filename)
 {
-	llifstream file;
+	if(!filename) return;
 
-	file.open(filename);
+	llifstream file(filename);
 
 	if (!file)
 	{
-		llinfos << "Couldn't open " << filename << ", aborting agentpilot load!" << llendl;
+		lldebugs << "Couldn't open " << filename
+			<< ", aborting agentpilot load!" << llendl;
 		return;
 	}
 	else
@@ -71,7 +72,7 @@ void LLAgentPilot::load(const char *filename)
 void LLAgentPilot::save(const char *filename)
 {
 	llofstream file;
-	file.open(filename);
+	file.open(filename);			/*Flawfinder: ignore*/
 
 	if (!file)
 	{