corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762

6 files changed, 11 insertions, 12 deletions

diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index 12d9d610cc..856e79191f 100644
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -758,7 +758,7 @@ size_t LLHTTPAssetStorage::nullOutputCallback(void *data, size_t size, size_t nm
 // this is a very limited function for use by the simstate loader and other one-offs
 S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata)
 {
-	// FIXME: There is no guarantee that the uuid and the asset_type match
+	// *NOTE: There is no guarantee that the uuid and the asset_type match
 	// - not that it matters. - Doug
 	lldebugs << "LLHTTPAssetStorage::getURLToFile() - " << url << llendl;
 
diff --git a/indra/llmessage/llthrottle.cpp b/indra/llmessage/llthrottle.cpp
index 01e83ca5cd..48a093fab7 100644
--- a/indra/llmessage/llthrottle.cpp
+++ b/indra/llmessage/llthrottle.cpp
@@ -472,7 +472,7 @@ BOOL LLThrottleGroup::dynamicAdjust()
 				// JC - Actually, need to let mCurrentBPS go less than nominal, otherwise
 				// you aren't allowing bandwidth to actually be moved from one channel
 				// to another.  
-				// FIXME: If clamping high end, would be good to re-
+				// *TODO: If clamping high end, would be good to re-
 				// allocate to other channels in the above code.
 				const F32 MAX_BPS = 4 * mNominalBPS[i];
 				if (mCurrentBPS[i] > MAX_BPS)
diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 46fc386d71..436363672e 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -693,7 +693,8 @@ void LLTransferSourceChannel::updateTransfers()
 
 	if (cdp->isBlocked())
 	{
-		// FIXME We need to make sure that the throttle bits available gets reset.
+		// *NOTE: We need to make sure that the throttle bits
+		// available gets reset.
 
 		// We DON'T want to send any packets if they're blocked, they'll just end up
 		// piling up on the other end.
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index ea0b13f703..0d784d2d9f 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -483,7 +483,7 @@ size_t headerCallback(void* data, size_t size, size_t nmemb, void* user)
 	size_t headerLen = size * nmemb;
 	LLURLRequestComplete* complete = (LLURLRequestComplete*)user;
 
-	// FIXME: This should be a utility in llstring.h: isascii()
+	// *TODO: This should be a utility in llstring.h: isascii()
 	for (size_t i = 0; i < headerLen; ++i)
 	{
 		if (headerLine[i] < 0)
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index cdafafc8db..99cfc7439b 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -454,9 +454,9 @@ BOOL LLMessageSystem::mTimeDecodes = FALSE;
 // static, 50ms per message decode
 F32  LLMessageSystem::mTimeDecodesSpamThreshold = 0.05f;
 
-// FIXME: This needs to be moved into a seperate file so that it never gets
+// *NOTE: This needs to be moved into a seperate file so that it never gets
 // included in the viewer.  30 Sep 2002 mark
-// NOTE: I don't think it's important that the messgage system tracks
+// *NOTE: I don't think it's important that the messgage system tracks
 // this since it must get set externally. 2004.08.25 Phoenix.
 static std::string g_shared_secret;
 std::string get_shared_secret();
@@ -4506,7 +4506,7 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **)
 	// times out, and allows us to re-establish it, but does
 	// mean that if our shared_secret or clock is wrong, we'll
 	// spin.
-	// FIXME: probably should keep a count of number of resends
+	// *TODO: probably should keep a count of number of resends
 	// per circuit, and stop resending after a while.
 	llinfos << "Got DenyTrustedCircuit. Sending CreateTrustedCircuit to "
 			<< msg->getSender() << llendl;
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index c33016669d..6f6bff6bf6 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -42,10 +42,6 @@ const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
 
 const S32 MESSAGE_MAX_PER_FRAME = 400;
 
-// FIXME: This needs to be moved to a server-side only header.
-// 30 Sep 2002 mark
-//extern char *MESSAGE_SHARED_SECRET;
-
 class LLMessageStringTable
 {
 public:
@@ -118,7 +114,9 @@ const F32 LL_MINIMUM_RELIABLE_TIMEOUT_SECONDS = 1.f;
 const F32 LL_MINIMUM_SEMIRELIABLE_TIMEOUT_SECONDS = 1.f;
 const F32 LL_PING_BASED_TIMEOUT_DUMMY = 0.0f;
 
-// FIXME:  These factors shouldn't include the msec to sec conversion implicitly
+// *NOTE: Maybe these factors shouldn't include the msec to sec conversion
+// implicitly.
+// However, all units should be MKS.
 const F32 LL_SEMIRELIABLE_TIMEOUT_FACTOR	= 5.f / 1000.f;		// factor * averaged ping
 const F32 LL_RELIABLE_TIMEOUT_FACTOR		= 5.f / 1000.f;      // factor * averaged ping
 const F32 LL_FILE_XFER_TIMEOUT_FACTOR		= 5.f / 1000.f;      // factor * averaged ping