6 files changed, 26 insertions, 19 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 50648a2d30..fda6d89a72 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -364,7 +364,8 @@ LONG WINAPI default_windows_exception_handler(struct _EXCEPTION_POINTERS *except
 	//
 	// Generate a minidump if we can.
 	//
-	// FIXME: This needs to be ported over form the viewer-specific LLWinDebug class
+	// TODO: This needs to be ported over form the viewer-specific
+	// LLWinDebug class
 
 	//
 	// At this point, we always want to exit the app.  There's no graceful
@@ -510,10 +511,13 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
 		{
 			llinfos << "Signal handler - Got SIGCHLD from " << info->si_pid << llendl;
 		}
-		// Check result code for all child procs for which we've registered callbacks
-		// THIS WILL NOT WORK IF SIGCHLD IS SENT w/o killing the child (Go, launcher!)
-		// FIXME: Now that we're using SIGACTION, we can actually implement the launcher behavior to determine
-		// who sent the SIGCHLD even if it doesn't result in child termination
+
+		// Check result code for all child procs for which we've
+		// registered callbacks THIS WILL NOT WORK IF SIGCHLD IS SENT
+		// w/o killing the child (Go, launcher!)
+		// TODO: Now that we're using SIGACTION, we can actually
+		// implement the launcher behavior to determine who sent the
+		// SIGCHLD even if it doesn't result in child termination
 		if (LLApp::sChildMap.count(info->si_pid))
 		{
 			LLApp::sChildMap[info->si_pid].mGotSigChild = TRUE;
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index da5662c54d..b2ec090ddd 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -224,8 +224,9 @@ private:
 
 	static void runErrorHandler();
 
-	// FIXME: On Windows, we need a routine to reset the structured exception handler when some evil driver has taken it over for their own purposes
-
+	// *NOTE: On Windows, we need a routine to reset the structured
+	// exception handler when some evil driver has taken it over for
+	// their own purposes
 	typedef int(*signal_handler_func)(int signum);
 	static LLAppErrorHandler sErrorHandler;
 
diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
index eddfbb559e..a144ac6d93 100644
--- a/indra/llcommon/llmortician.cpp
+++ b/indra/llcommon/llmortician.cpp
@@ -32,7 +32,7 @@ void LLMortician::die()
 	// It is valid to call die() more than once on something that hasn't died yet
 	if (sDestroyImmediate)
 	{
-		//HACK: we need to do this to ensure destruction order on shutdown
+		// *NOTE: This is a hack to ensure destruction order on shutdown.
 		mIsDead = TRUE;
 		delete this;
 		return;
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 2824d0f73c..c21b8f19a4 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -368,11 +368,12 @@ LLSD LLSDXMLParser::Impl::parse(std::istream& input)
 		}
 	}
 	
-	// FIXME: This code is buggy - if the stream was empty or not good, there
-	// is not buffer to parse, both the call to XML_ParseBuffer and the buffer
-	// manipulations are illegal
-	// futhermore, it isn't clear that the expat buffer semantics are preserved
-	
+	// *FIX.: This code is buggy - if the stream was empty or not
+	// good, there is not buffer to parse, both the call to
+	// XML_ParseBuffer and the buffer manipulations are illegal
+	// futhermore, it isn't clear that the expat buffer semantics are
+	// preserved
+
 	status = XML_ParseBuffer(mParser, 0, true);
 	if (status == XML_STATUS_ERROR && !mGracefullStop)
 	{
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 61d83f7259..8a32a04fc2 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -97,10 +97,11 @@ struct DeletePairedPointerArray
 
 
 // Alternate version of the above so that has a more cumbersome
-// syntax, but it can be used with compositional functors.  *FIX: The
-// functor retuns a bool because msdev bombs during the composition if
-// you return void. Once we upgrade to a newer compiler, the second
-// unary_function template parameter can be set to void.
+// syntax, but it can be used with compositional functors.
+// NOTE: The functor retuns a bool because msdev bombs during the
+// composition if you return void. Once we upgrade to a newer
+// compiler, the second unary_function template parameter can be set
+// to void.
 //
 // Here's a snippit showing how you use this object:
 //
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 65fa4a5c9c..9c54ddaac1 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -344,7 +344,7 @@ void LLCPUInfo::stream(std::ostream& s) const
 		s << "Unable to collect processor info";
 	}
 #else
-	// *FIX: This works on linux. What will it do on other systems?
+	// *NOTE: This works on linux. What will it do on other systems?
 	FILE* cpuinfo = LLFile::fopen(CPUINFO_FILE, "r");		/* Flawfinder: ignore */
 	if(cpuinfo)
 	{
@@ -430,7 +430,7 @@ void LLMemoryInfo::stream(std::ostream& s) const
 	}
 	
 #else
-	// *FIX: This works on linux. What will it do on other systems?
+	// *NOTE: This works on linux. What will it do on other systems?
 	FILE* meminfo = LLFile::fopen(MEMINFO_FILE,"r");		/* Flawfinder: ignore */
 	if(meminfo)
 	{