1 files changed, 18 insertions, 13 deletions

diff --git a/linden/indra/newview/llagentpilot.cpp b/linden/indra/newview/llagentpilot.cpp
index b4a1d86..f2a1903 100644
--- a/linden/indra/newview/llagentpilot.cpp
+++ b/linden/indra/newview/llagentpilot.cpp
@@ -45,22 +45,28 @@ LLAgentPilot gAgentPilot;
 
 BOOL LLAgentPilot::sLoop = TRUE;
 
-LLAgentPilot::LLAgentPilot()
+LLAgentPilot::LLAgentPilot() :
+        mNumRuns(-1),
+        mQuitAfterRuns(FALSE),
+        mRecording(FALSE),
+        mLastRecordTime(0.f),
+        mStarted(FALSE),
+        mPlaying(FALSE),
+        mCurrentAction(0)
 {
-        mRecording = FALSE;
-        mPlaying = FALSE;
-        mStarted = FALSE;
-        mNumRuns = -1;
 }
 
 LLAgentPilot::~LLAgentPilot()
 {
 }
 
-void LLAgentPilot::load(const char *filename)
+void LLAgentPilot::load(const std::string& filename)
 {
-        if(!filename) return;
-
+        if(filename.empty())
+        {
+                return;
+        }
+        
         llifstream file(filename);
 
         if (!file)
@@ -78,8 +84,7 @@ void LLAgentPilot::load(const char *filename)
 
         file >> num_actions;
 
-        S32 i;
-        for (i = 0; i < num_actions; i++)
+        for (S32 i = 0; i < num_actions; i++)
         {
                 S32 action_type;
                 Action new_action;
@@ -92,10 +97,10 @@ void LLAgentPilot::load(const char *filename)
         file.close();
 }
 
-void LLAgentPilot::save(const char *filename)
+void LLAgentPilot::save(const std::string& filename)
 {
         llofstream file;
-        file.open(filename);                    /*Flawfinder: ignore*/
+        file.open(filename);
 
         if (!file)
         {
@@ -125,7 +130,7 @@ void LLAgentPilot::startRecord()
 void LLAgentPilot::stopRecord()
 {
         gAgentPilot.addAction(STRAIGHT);
-        gAgentPilot.save(gSavedSettings.getString("StatsPilotFile").c_str());
+        gAgentPilot.save(gSavedSettings.getString("StatsPilotFile"));
         mRecording = FALSE;
 }