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

51 files changed, 180 insertions, 148 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e46800fff1..5a08f94b71 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2519,7 +2519,7 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
 		}
 		else
 		{
-			//FIXME: rotate mframeagent by sit object's rotation?
+			// *FIX: rotate mframeagent by sit object's rotation?
 			LLQuaternion look_rotation = mAvatarObject->mIsSitting ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion(); // use camera's current rotation
 			LLVector3 look_offset = LLVector3(2.f, 0.f, 0.f) * look_rotation * av_inv_rot;
 			setLookAt(LOOKAT_TARGET_IDLE, mAvatarObject, look_offset);
@@ -2705,7 +2705,7 @@ U8 LLAgent::getRenderState()
 		return 0;
 	}
 
-	// FIXME: don't do stuff in a getter!  This is infinite loop city!
+	// *FIX: don't do stuff in a getter!  This is infinite loop city!
 	if ((mTypingTimer.getElapsedTimeF32() > TYPING_TIMEOUT_SECS) 
 		&& (mRenderState & AGENT_STATE_TYPING))
 	{
@@ -3076,7 +3076,7 @@ void LLAgent::updateCamera()
 			// where it is updated. All three of its attributes are updated: (1) position, 
 			// (2) focus, and (3) upvector. They can then be queried elsewhere in llAgent.
 			//--------------------------------------------------------------------------------
-			//FIXME: use combined rotation of frameagent and sit object
+			// *TODO: use combined rotation of frameagent and sit object
 			LLQuaternion avatarRotationForFollowCam = mAvatarObject->mIsSitting ? mAvatarObject->getRenderRotation() : mFrameAgent.getQuaternion();
 
 			LLFollowCamParams* current_cam = LLFollowCamMgr::getActiveFollowCamParams();
@@ -3452,7 +3452,7 @@ LLVector3d LLAgent::calcFocusPositionTargetGlobal()
 			}
 			LLVector3 focus_agent = mFocusObject->getRenderPosition() + mFocusObjectOffset;
 			mFocusTargetGlobal.setVec(getPosGlobalFromAgent(focus_agent));
-			//FIXME: get camera pointat behavior working
+			// *FIX: get camera pointat behavior working
 			//if (mTrackFocusObject)
 			//{
 			//	mCameraFocusOffset = gAgent.getPosGlobalFromAgent(gCamera->getOrigin()) - mFocusTargetGlobal;
@@ -7119,7 +7119,7 @@ void LLAgent::queryWearableCache()
 		{
 			hash ^= BAKED_TEXTURE_HASH[baked_texture_index];
 			num_queries++;
-			//FIXME: make sure at least one request gets packed
+			// *NOTE: make sure at least one request gets packed
 
 			//llinfos << "Requesting texture for hash " << hash << " in baked texture slot " << baked_texture_index << llendl;
 			gMessageSystem->nextBlockFast(_PREHASH_WearableData);
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index cb96be2401..196d95cc29 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -20,7 +20,7 @@
 #include "llinventoryview.h"
 #include "llpermissionsflags.h"
 #include "lluploaddialog.h"
-#include "llviewermenu.h"	// FIXME -- for upload_new_resource()
+#include "llviewermenu.h"	// for upload_new_resource()
 #include "llviewerwindow.h"
 #include "viewer.h"
 
@@ -165,9 +165,9 @@ void LLNewAgentInventoryResponder::result(const LLSD& result)
 		// remove the "Uploading..." message
 		LLUploadDialog::modalUploadFinished();
 		
-		// *FIX: This is a pretty big hack. What this does is check the
-		// file picker if there are any more pending uploads. If so,
-		// upload that file.
+		// *NOTE: This is a pretty big hack. What this does is check
+		// the file picker if there are any more pending uploads. If
+		// so, upload that file.
 		const char* next_file = LLFilePicker::instance().getNextFile();
 		if(next_file)
 		{
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index c53d1d9ebc..da39bf0751 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -613,7 +613,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 				// we were tracking someone who went offline
 				deleteTrackingData();
 			}
-			//FIXME get actual inventory id
+			// *TODO: get actual inventory id
 			gInventory.addChangedMask(LLInventoryObserver::CALLING_CARD, LLUUID::null);
 		}
 		if(notify)
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 70e124f6c4..e2fab454f1 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -56,10 +56,6 @@ private:
 	
 	void buildDirname( void );
 
-#if LL_WINDOWS
-//FIXME
-#endif
-
 #if LL_DARWIN
 	NavDialogCreationOptions mNavOptions;
 	static pascal void doNavCallbackEvent(NavEventCallbackMessage callBackSelector,
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index a198886d37..c4ee6acb8c 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -668,7 +668,8 @@ void LLDrawable::updateTexture()
 		return;
 	}
 	
-	//FIXME: this updates textures on all faces in this drawable, not just the viewer object we care about
+	// *FIX: this updates textures on all faces in this drawable, not
+	// just the viewer object we care about
 	if (mVObjp->getNumTEs())
 	{
 		// For each face in this drawable, change the drawpool if necessary.
@@ -768,9 +769,9 @@ void LLDrawable::shiftPos(const LLVector3 &shift_vector)
 	mXform.setScale(1,1,1);
 	mXform.updateMatrix();
 
-	if (isStatic() || //DP FIXME: don't know why this is happening, but
-					//some terrain patches are becoming active
-					//(earth quake, maybe?)
+	if (isStatic() || // *FIX: don't know why this is happening, but
+					// some terrain patches are becoming active
+					// (earth quake, maybe?) DP
 		getRenderType() == LLPipeline::RENDER_TYPE_TERRAIN)
 	{
 		LLStrider<LLVector3>  verticesp;
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index 3e51e01699..3e6ae7bf85 100644
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -1007,10 +1007,10 @@ void LLDrawPoolTerrain::renderOwnership()
 	glClientActiveTextureARB(GL_TEXTURE0_ARB);
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	
-	// HACK: Because the region is 256 meters wide, but has 257 pixels, the 
-	// texture coordinates for pixel 256x256 is not 1,1.  This makes the
-	// ownership map not line up with the selection.  Fix this with a texture
-	// matrix multiply.
+	// *NOTE: Because the region is 256 meters wide, but has 257 pixels, the 
+	// texture coordinates for pixel 256x256 is not 1,1. This makes the
+	// ownership map not line up with the selection. We address this with
+	// a texture matrix multiply.
 	glMatrixMode(GL_TEXTURE);
 	glPushMatrix();
 
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index a1b7300ec9..701c8087dd 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -622,7 +622,7 @@ void LLFace::renderForSelect() const
 		S32 name = mVObjp->mGLName;
 
 		LLColor4U color((U8)(name >> 16), (U8)(name >> 8), (U8)name);
-#if 0 // FIXME: Postponing this fix until we have texcoord pick info...
+#if 0 // *FIX: Postponing this fix until we have texcoord pick info...
 		if (mTEOffset != -1)
 		{
 			color.mV[VALPHA] = (U8)(getTextureEntry()->getColor().mV[VALPHA] * 255.f);
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index 221c58cff3..3f79161f92 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -270,8 +270,9 @@ void LLFloaterBuy::onClickBuy(void*)
 	LLUUID category_id;
 	category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
 
-	// FIXME: doesn't work for multiple object buy, which UI does not currently support
-	// sale info is used for verification only, if it doesn't match region info then sale is canceled
+	// *NOTE: doesn't work for multiple object buy, which UI does not
+	// currently support sale info is used for verification only, if
+	// it doesn't match region info then sale is canceled.
 	gSelectMgr->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo );
 
 	sInstance->close();
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index c0ca919344..0b3df52e07 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -259,8 +259,9 @@ void LLFloaterBuyContents::onClickBuy(void*)
 	LLUUID category_id;
 	category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CATEGORY);
 
-	// FIXME: doesn't work for multiple object buy, which UI does not currently support
-	// sale info is used for verification only, if it doesn't match region info then sale is canceled
+	// *NOTE: doesn't work for multiple object buy, which UI does not
+	// currently support sale info is used for verification only, if
+	// it doesn't match region info then sale is canceled.
 	gSelectMgr->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo);
 
 	sInstance->close();
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 6c8b7368a0..cf73a1104d 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -330,8 +330,10 @@ void LLFloaterBuyLandUI::updateAgentInfo()
 {
 	mAgentCommittedTier = gStatusBar->getSquareMetersCommitted();
 	mAgentCashBalance = gStatusBar->getBalance();
+
+	// *TODO: This is an approximation, we should send this value down
+	// to the viewer. See SL-10728 for details.
 	mAgentHasNeverOwnedLand = mAgentCommittedTier == 0;
-		// FIXME: this is an approximation, see SL-10728
 }
 
 void LLFloaterBuyLandUI::updateParcelInfo()
@@ -493,7 +495,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 			return;
 		}
 		
-		// FIXME: There should be a check based on the database value
+		// *TODO: There should be a check based on the database value
 		// indra.user.ever_owned_land, only that value never makes it
 		// to the viewer, see SL-10728
 	}
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index d80dbca310..cc522bf75b 100644
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -58,7 +58,7 @@ BOOL LLFloaterScriptDebug::postBuild()
 
 	if (mTabContainer)
 	{
-		// FIXME: apparantly fails for tab containers?
+		// *FIX: apparantly fails for tab containers?
 // 		mTabContainer->requires("all_scripts", WIDGET_TYPE_FLOATER);
 // 		mTabContainer->checkRequirements();
 		return TRUE;
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 8219ae8844..bc6bc297c4 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -442,7 +442,7 @@ void LLSnapshotLivePreview::draw()
 				glColor4fv(image_color.mV);
 				LLViewerImage::bindTexture(mViewerImage[old_image_index]);
 				// calculate UV scale
-				//FIXME get this to work with old image
+				// *FIX get this to work with old image
 				BOOL rescale = !mImageScaled[old_image_index] && mViewerImage[mCurImageIndex].notNull();
 				F32 uv_width = rescale ? llmin((F32)mWidth[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getWidth(), 1.f) : 1.f;
 				F32 uv_height = rescale ? llmin((F32)mHeight[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getHeight(), 1.f) : 1.f;
@@ -540,7 +540,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 
 			if (previewp->getSnapshotType() == SNAPSHOT_POSTCARD)
 			{
-				//FIXME: just resize and reuse existing jpeg?
+				// *FIX: just resize and reuse existing jpeg?
 				previewp->mJPEGImage = NULL; // deletes image
 				previewp->mJPEGImage = new LLImageJPEG();
 				previewp->mJPEGImage->setEncodeQuality(llclamp(previewp->mSnapshotQuality, 0, 100));
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 3492a36353..739f2cf3c7 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -527,7 +527,8 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const LLString& na
 	if(iface->setCurrentByID(avatar_id) || gAgent.isGodlike())
 	{
 		// *HACK: Adjust Z values automatically for liaisons & gods so
-		// we swoop down when they click on the map.
+		// they swoop down when they click on the map. Requested
+		// convenience.
 		if(gAgent.isGodlike())
 		{
 			childSetValue("spin z", LLSD(200.f));
@@ -671,8 +672,9 @@ void LLFloaterWorldMap::updateLocation()
 		
 		if (status == LLTracker::TRACKING_AVATAR)
 		{
-			// *HACK: Adjust Z values automatically for liaisons & gods so
-			// we swoop down when they click on the map.
+			// *HACK: Adjust Z values automatically for liaisons &
+			// gods so they swoop down when they click on the
+			// map. Requested convenience.
 			if(gAgent.isGodlike())
 			{
 				pos_global[2] = 200;
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index e9d7808fd2..3c0ba7ae28 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -20,7 +20,7 @@
 #include "llinventory.h"
 
 #include "llcallbacklist.h"
-#include "llinventoryclipboard.h" // *FIX: remove this!!!!
+#include "llinventoryclipboard.h" // *TODO: remove this once hack below gone.
 #include "llinventoryview.h"// hacked in for the bonus context menu items.
 #include "llkeyboard.h"
 #include "lllineeditor.h"
@@ -39,7 +39,9 @@
 #include "llvoavatar.h"
 #include "llfloaterproperties.h"
 
-//RN: HACK
+// RN: HACK
+// We need these because some of the code below relies on things like
+// gAgent root folder. Remove them once the abstraction leak is fixed.
 #include "llagent.h"
 #include "viewer.h"
 
@@ -400,10 +402,11 @@ void LLFolderViewItem::dirtyFilter()
 	}
 }
 
-// *FIX: This can be optimized a lot by simply recording that it is selected in
-// the appropriate places, and assuming that set selection means 'deselect' for a
-// leaf item. Do this optimization after multiple selection is implemented to
-// make sure it all plays nice together.
+// *TODO: This can be optimized a lot by simply recording that it is
+// selected in the appropriate places, and assuming that set selection
+// means 'deselect' for a leaf item. Do this optimization after
+// multiple selection is implemented to make sure it all plays nice
+// together.
 BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL open,
 									BOOL take_keyboard_focus)
 {
@@ -634,7 +637,8 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 			{
 				LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_WORLD;
 
-				//FIXME: push this into listener and remove dependency on llagent
+				// *TODO: push this into listener and remove
+				// dependency on llagent
 				if(mListener && gInventory.isObjectDescendentOf(mListener->getUUID(), gAgent.getInventoryRootID()))
 				{
 					src = LLToolDragAndDrop::SOURCE_AGENT;
@@ -3452,7 +3456,7 @@ BOOL LLFolderView::canCopy()
 // copy selected item
 void LLFolderView::copy()
 {
-	// *FIX: total hack to clear the inventory clipboard
+	// *NOTE: total hack to clear the inventory clipboard
 	LLInventoryClipboard::instance().reset();
 	S32 count = mSelectedItems.size();
 	if(getVisible() && mEnabled && (count > 0))
@@ -3493,7 +3497,7 @@ BOOL LLFolderView::canPaste()
 		selected_items_t::iterator item_it;
 		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 		{
-			//FIXME: only check folders and parent folders of items
+			// *TODO: only check folders and parent folders of items
 			LLFolderViewItem* item = (*item_it);
 			LLFolderViewEventListener* listener = item->getListener();
 			if(!listener || !listener->isClipboardPasteable())
@@ -4614,7 +4618,7 @@ void LLInventoryFilter::setHoursAgo(U32 hours)
 {
 	if (mFilterOps.mHoursAgo != hours)
 	{
-		//FIXME: need to cache last filter time, in case filter goes stale
+		// *NOTE: need to cache last filter time, in case filter goes stale
 		BOOL less_restrictive = (mFilterOps.mMinDate == 0 && mFilterOps.mMaxDate == U32_MAX && hours > mFilterOps.mHoursAgo);
 		BOOL more_restrictive = (mFilterOps.mMinDate == 0 && mFilterOps.mMaxDate == U32_MAX && hours <= mFilterOps.mHoursAgo);
 		mFilterOps.mHoursAgo = hours;
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 106369ac01..1d09d88486 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1386,7 +1386,7 @@ void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
 		if (!group_datap->isMemberDataComplete()
 			|| !group_datap->isRoleDataComplete())
 		{
-			// TODO: KLW FIXME: Should we start a member or role data request?
+			// *TODO: KLW FIXME: Should we start a member or role data request?
 			llinfos << " Pending: " << (group_datap->mPendingRoleMemberRequest ? "Y" : "N")
 				<< " MemberDataComplete: " << (group_datap->mMemberDataComplete ? "Y" : "N")
 				<< " RoleDataComplete: " << (group_datap->mRoleDataComplete ? "Y" : "N") << llendl;
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 9f1b80e1ba..c95faed438 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -466,7 +466,9 @@ void LLHUDEffectLookAt::calcTargetPosition()
 			}
 			else if (looking_at_self && gAgent.cameraCustomizeAvatar())
 			{
-				//FIXME: have animation overrides for lookat behavior and then we don't need to do this
+				// *NOTE: We have to do this because animation
+				// overrides do not set lookat behavior.
+				// *TODO: animation overrides for lookat behavior.
 				objRot = avatarp->mPelvisp->getWorldRotation();
 			}
 			else
diff --git a/indra/newview/llhudeffectpointat.cpp b/indra/newview/llhudeffectpointat.cpp
index f72c5b06de..de85cf7293 100644
--- a/indra/newview/llhudeffectpointat.cpp
+++ b/indra/newview/llhudeffectpointat.cpp
@@ -115,8 +115,6 @@ void LLHUDEffectPointAt::packData(LLMessageSystem *mesgsys)
 	mLastSendTime = mTimer.getElapsedTimeF32();
 }
 
-//FIXME: avatar selection does a weird double take
-
 //-----------------------------------------------------------------------------
 // unpackData()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index ad2ba368c9..bb261e6a96 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -148,19 +148,19 @@ void LLHUDText::renderText(BOOL for_select)
 
 	mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f));
 
-	//FIXME: cache this image
+	// *TODO: cache this image
 	LLUUID image_id;
 	image_id.set(gViewerArt.getString("rounded_square.tga"));
 	LLViewerImage* imagep = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
 
-	//FIXME: make this a per-text setting
+	// *TODO: make this a per-text setting
 	LLColor4 bg_color = gSavedSettings.getColor4("BackgroundChatColor");
 	bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor);
 
 	const S32 border_height = 16;
 	const S32 border_width = 16;
 
-	//FIXME move this into helper function
+	// *TODO move this into helper function
 	F32 border_scale = 1.f;
 
 	if (border_height * 2 > mHeight)
@@ -939,7 +939,7 @@ void LLHUDText::renderAllHUD()
 void LLHUDText::addPickable(std::set<LLViewerObject*> &pick_list)
 {
 	//this might put an object on the pick list a second time, overriding it's mGLName, which is ok
-	//FIXME: we should probably cull against pick frustum
+	// *FIX: we should probably cull against pick frustum
 	VisibleTextObjectIterator text_it;
 	for (text_it = sVisibleTextObjects.begin(); text_it != sVisibleTextObjects.end(); ++text_it)
 	{
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ed9209935e..47ab6e6b87 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -183,7 +183,7 @@ BOOL LLInvFVBridge::isItemMovable()
 	return TRUE;
 }
 
-//FIXME: make sure this does the right thing
+// *TODO: make sure this does the right thing
 void LLInvFVBridge::showProperties()
 {
 	LLShowProps::showProperties(mUUID);
@@ -420,7 +420,7 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	hideContextEntries(menu, items, disabled_items);
 }
 
-//FIXME: remove this
+// *TODO: remove this
 BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id)
 {
 	BOOL rv = FALSE;
@@ -3366,7 +3366,7 @@ void LLLSLTextBridge::openItem()
 // |        LLWearableBridge                         |
 // +=================================================+
 
-// HACK to get from avatar inventory to avatar
+// *NOTE: hack to get from avatar inventory to avatar
 void wear_inventory_item_on_avatar( LLInventoryItem* item )
 {
 	if(item)
@@ -3663,7 +3663,7 @@ void wear_inventory_category(LLInventoryCategory* category, bool copy, bool appe
 	}
 }
 
-// HACK to get from avatar inventory to avatar
+// *NOTE: hack to get from avatar inventory to avatar
 void wear_inventory_category_on_avatar( LLInventoryCategory* category, BOOL append )
 {
 	// Avoid unintentionally overwriting old wearables.  We have to do
@@ -4161,7 +4161,8 @@ void LLWearableBridge::openItem()
 		}
 		else if(item)
 		{
-			// *FIX: Could in theory fetch and then do the operation above.
+			// *TODO: We should fetch the item details, and then do
+			// the operation above.
 			gViewerWindow->alertXml("CannotWearInfoNotComplete");
 		}
 	}
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index a9508753c5..46014f2a0b 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -86,7 +86,7 @@ LLManipRotate::LLManipRotate( LLToolComposite* composite )
 
 void LLManipRotate::handleSelect()
 {
-	//FIXME: put this in mouseDown?
+	// *FIX: put this in mouseDown?
 	gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
 	gFloaterTools->setStatusText("Drag colored bands to rotate object");
 }
@@ -1292,7 +1292,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 		LLSelectNode* first_node = gSelectMgr->getFirstMoveableNode(TRUE);
 		if (first_node)
 		{
-			//FIXME: get agent local attachment grid working
+			// *FIX: get agent local attachment grid working
 			// Put rotation into frame of first selected root object
 			axis = axis * grid_rotation;
 		}
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index aa3749b539..2b5926514e 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -1896,7 +1896,6 @@ LLVector3 LLManipScale::cornerToUnitVector( S32 part ) const
 LLVector3 LLManipScale::edgeToUnitVector( S32 part ) const
 {
 	llassert( (LL_EDGE_MIN <= part) && (part <= LL_EDGE_MAX) );
-	//FIXME
 	part -= LL_EDGE_MIN;
 	S32 rotation = part >> 2;				// Edge between which faces: 0 => XY, 1 => YZ, 2 => ZX
 	LLVector3 v;
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 3db23c06ca..b1a9b06720 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -612,7 +612,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 	}
 
 	// Clamp to arrow direction
-	//FIXME: does this apply anymore?
+	// *FIX: does this apply anymore?
 	if (!axis_exists)
 	{
 		axis_magnitude = relative_move.normVec();
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index 219f069de8..9969a87a83 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -35,7 +35,7 @@ public:
 	static void toggle(void*);
 	static BOOL visible(void*);
 	
-	// HACK for agent-driven button highlighting
+	// This function is used for agent-driven button highlighting
 	static LLFloaterMove* getInstance()				{ return sInstance; }
 
 protected:
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 178d707bb0..6be8bc8c78 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -598,9 +598,10 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_s
 			region->getHost().getString(buffer, MAX_STRING);
 			msg.append(buffer);
 #endif
-			// FIXME: put in XML so it can be translated
+			// *TODO: put this under the control of XUI so it can be
+			// translated.
 			msg.append("\n(Double-click to open Map)");
-						
+
 			S32 SLOP = 4;
 			localPointToScreen( 
 				x - SLOP, y - SLOP, 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 185073b6e7..b013befca5 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -44,7 +44,7 @@
 #include "lltooldraganddrop.h"
 #include "lluiconstants.h"
 #include "llvoavatar.h"
-#include "llviewermenu.h"		// FIXME: for is_agent_friend()
+#include "llviewermenu.h"		// *FIX: for is_agent_friend()
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
 #include "llviewborder.h"
@@ -184,7 +184,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 			if(gInventory.getItem(inv_item->getUUID())
 				&& LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
 			{
-				//FIXME: get multiple object transfers working
+				// *TODO: get multiple object transfers working
 				*accept = ACCEPT_YES_COPY_SINGLE;
 				if(drop)
 				{
@@ -206,7 +206,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 			LLViewerInventoryCategory* inv_cat = (LLViewerInventoryCategory*)cargo_data;
 			if( gInventory.getCategory( inv_cat->getUUID() ) )
 			{
-				//FIXME: get multiple object transfers working
+				// *TODO: get multiple object transfers working
 				*accept = ACCEPT_YES_COPY_SINGLE;
 				if(drop)
 				{
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index ad3c3d42b0..e9b446568e 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -141,9 +141,6 @@ void LLPanelContents::onClickNewScript(void *userdata)
 	}
 	if(object)
 	{
-		// *HACK: In order to resolve SL-22177, we need to create the
-		// script first, and then you have to click it in inventory to
-		// edit it. Bring this back when the functionality is secure.
 		LLPermissions perm;
 		perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
 		perm.initMasks(
@@ -168,6 +165,13 @@ void LLPanelContents::onClickNewScript(void *userdata)
 				LLViewerInventoryItem::II_FLAGS_NONE,
 				time_corrected());
 		object->saveScript(new_item, TRUE, true);
+
+		// *NOTE: In order to resolve SL-22177, we needed to create
+		// the script first, and then you have to click it in
+		// inventory to edit it.
+		// *TODO: The script creation should round-trip back to the
+		// viewer so the viewer can auto-open the script and start
+		// editing ASAP.
 #if 0
 		S32 left, top;
 		gFloaterView->getNewFloaterPosition(&left, &top);
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 9f774db2e9..4b2b200f3f 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -125,7 +125,7 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 			if(gInventory.getItem(inv_item->getUUID())
 				&& LLToolDragAndDrop::isInventoryGroupGiveAcceptable(inv_item))
 			{
-				//FIXME: get multiple object transfers working
+				// *TODO: get multiple object transfers working
 				*accept = ACCEPT_YES_COPY_SINGLE;
 				if(drop)
 				{
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 71eeef97ff..ac50425e67 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -261,7 +261,7 @@ void LLPanelObject::getState( )
 	if(!objectp)
 	{
 		objectp = gSelectMgr->getFirstObject();
-		//FIXME: shouldn't we just keep the child?
+		// *FIX: shouldn't we just keep the child?
 		if (objectp)
 		{
 			LLViewerObject* parentp = objectp->getSubParent();
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index cd942db7e1..d43513fc54 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -122,7 +122,7 @@ void LLPanelVolume::getState( )
 	if(!objectp)
 	{
 		objectp = gSelectMgr->getFirstObject();
-		//FIXME: shouldn't we just keep the child?
+		// *FIX: shouldn't we just keep the child?
 		if (objectp)
 		{
 			LLViewerObject* parentp = objectp->getSubParent();
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 8eeddeaa18..a2698763f0 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -246,7 +246,7 @@ void LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face)
 
 	// Stop the object from moving (this anticipates changes on the
 	// simulator in LLTask::userSelect)
-	//FIXME: shouldn't zero out these either
+	// *FIX: shouldn't zero out these either
 	object->setVelocity(LLVector3::zero);
 	object->setAcceleration(LLVector3::zero);
 	//object->setAngularVelocity(LLVector3::zero);
@@ -928,7 +928,7 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
 {
 	LLSelectNode* grid_node = mGridObjects.getFirstNode();
 	LLViewerObject* grid_object = mGridObjects.getFirstObject();
-	//FIXME: get to work with multiple grid objects
+	// *TODO: get to work with multiple grid objects
 	if (grid_node && grid_node->getObject()->isDead())
 	{
 		mGridObjects.removeNode(grid_node);
@@ -960,7 +960,8 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
 				LLVector3 local_min_extents(F32_MAX, F32_MAX, F32_MAX);
 				LLVector3 local_max_extents(F32_MIN, F32_MIN, F32_MIN);
 
-				//FIXME: silhouette flag is insufficient as it gets cleared by view update
+				// *FIX: silhouette flag is insufficient as it gets
+				// cleared by view update.
 				if (!mGridValid || 
 					grid_object->isChanged(LLXform::SILHOUETTE)
 					|| (grid_object->getParent() && grid_object->getParent()->isChanged(LLXform::SILHOUETTE)))
@@ -1116,7 +1117,7 @@ void LLSelectMgr::remove(LLDynamicArray<LLViewerObject*>& objects)
 void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
 {
 	// check if object already in list
-	// FIXME: can we just check isSelected()?
+	// *FIX: can we just check isSelected()?
 	LLSelectNode *nodep = findSelectNode(objectp);
 
 	if (!nodep)
@@ -1371,7 +1372,7 @@ void LLSelectMgr::cleanup()
 //-----------------------------------------------------------------------------
 // selectionSetImage()
 //-----------------------------------------------------------------------------
-//FIXME: re-arch texture applying out of lltooldraganddrop
+// *TODO: re-arch texture applying out of lltooldraganddrop
 void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 {
 	// First for (no copy) textures and multiple object selection
@@ -1398,7 +1399,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 			LLToolDragAndDrop::dropTextureOneFace(objectp,te,item,LLToolDragAndDrop::SOURCE_AGENT,LLUUID::null);
 			
 			// HACK! HACK! ARG!
-			// FIXME: Replace mSelectedObjects with a REAL container class!
+			// *TODO: Replace mSelectedObjects with a REAL container class!
 			LLViewerObject* tmp_object;
 			S32 tmp_te;
 			mSelectedObjects.getCurrentTE(&tmp_object,&tmp_te);
@@ -3649,9 +3650,10 @@ struct LLBuyData
 	LLSaleInfo mSaleInfo;
 };
 
-// FIXME: doesn't work for multiple object buy, which UI does not currently support
-// sale info is used for verification only, if it doesn't match region info then sale is canceled
-// Need to get sale info -as displayed in the UI- for every item.
+// *NOTE: does not work for multiple object buy, which UI does not
+// currently support sale info is used for verification only, if it
+// doesn't match region info then sale is canceled Need to get sale
+// info -as displayed in the UI- for every item.
 void LLSelectMgr::sendBuy(const LLUUID& buyer_id, const LLUUID& category_id, const LLSaleInfo sale_info)
 {
 	LLBuyData buy;
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index df07e5518f..77039213d4 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -435,9 +435,11 @@ public:
 	void sendOwner(const LLUUID& owner_id, const LLUUID& group_id, BOOL override = FALSE);
 	void sendGroup(const LLUUID& group_id);
 
-	// Category ID is the UUID of the folder you want to contain the purchase
-	// FIXME: sale_info check doesn't work for multiple object buy, which UI does not currently support
-	// sale info is used for verification only, if it doesn't match region info then sale is canceled
+	// Category ID is the UUID of the folder you want to contain the purchase.
+	// *NOTE: sale_info check doesn't work for multiple object buy,
+	// which UI does not currently support sale info is used for
+	// verification only, if it doesn't match region info then sale is
+	// canceled
 	void sendBuy(const LLUUID& buyer_id, const LLUUID& category_id, const LLSaleInfo sale_info);
 	void sendAttach(U8 attachment_point);
 	void sendDetach();
@@ -570,7 +572,7 @@ public:
 	void setTransient(BOOL transient) { mTransient = transient; }
 	BOOL isTransient() { return mTransient; }
 	LLViewerObject *getObject();
-	//FIXME: invalidate stored textures and colors when # faces change
+	// *NOTE: invalidate stored textures and colors when # faces change
 	void saveColors();
 	void saveTextures(const std::vector<LLUUID>& textures);
 	void saveTextureScaleRatios();
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 643b86e104..fea8924b78 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -656,7 +656,7 @@ BOOL idle_startup()
 		}
 
 		// create necessary directories
-		// FIXME: these mkdir's should error check
+		// *FIX: these mkdir's should error check
 		gDirUtilp->setLindenUserDir(firstname.c_str(), lastname.c_str());
 
 
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index da468d4ab1..bc35b90086 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -507,7 +507,7 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
 				else
 				{
 					llinfos << "Baked upload failed. Reason: " << result << llendl;
-					//FIXME: retry upload after n seconds, asset server could be busy
+					// *FIX: retry upload after n seconds, asset server could be busy
 				}
 			}
 			else
@@ -1196,8 +1196,9 @@ BOOL LLTexLayer::setInfo(LLTexLayerInfo* info)
 		LLTexLayerInfo::morph_name_list_t::iterator iter;
 		for (iter = mInfo->mMorphNameList.begin(); iter != mInfo->mMorphNameList.end(); iter++)
 		{
-			// FIXME: we assume that the referenced visual param is a morph target, 
-			// need a better way of actually looking this up
+			// *FIX: we assume that the referenced visual param is a
+			// morph target, need a better way of actually looking
+			// this up.
 			LLPolyMorphTarget *morph_param;
 			LLString *name = &(iter->first);
 			morph_param = (LLPolyMorphTarget *)(getTexLayerSet()->getAvatar()->getVisualParam(name->c_str()));
@@ -2800,7 +2801,8 @@ void LLGradientPaletteList::initPalette(F32 domain)
 		S32 ramp_end = 255;
 		F32 ramp_factor = (ramp_end == ramp_start) ? 0.f : (255.f / ((F32)ramp_end - (F32)ramp_start));
 
-		//FIXME: move conditionals outside of loop, since this really is just a sequential process
+		// *TODO: move conditionals outside of loop, since this really
+		// is just a sequential process.
 		for (S32 i = 0; i < 512; i++)
 		{
 			palette[(i * 4) + 1] = 0;
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 8a098f4482..106bfd0095 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -971,8 +971,8 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
 	else
 	{
 		setToolTip( "" );
-		//FIXME: would be better to keep floater open
-		// and show disabled state
+		// *TODO: would be better to keep floater open and show
+		// disabled state.
 		closeFloater();
 	}
 
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 2b8d4ed73c..f295c66ee1 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -176,7 +176,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 			gToolTranslate->setCurrentTool( gToolTranslate->mSelectRect );
 			gToolTranslate->mSelectRect->handleMouseDown( x, y, mask );
 
-			//FIXME: add toggle to trigger old click-drag functionality
+			// *TODO: add toggle to trigger old click-drag functionality
 			// gToolTranslate->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
 		}
 	}
@@ -377,8 +377,8 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 
 void LLToolCompCreate::pickCallback(S32 x, S32 y, MASK mask)
 {
-	// HACK: Mask off shift and control, so you can't multi-select
-	// multiple objects with the create tool.
+	// *NOTE: We mask off shift and control, so you cannot
+	// multi-select multiple objects with the create tool.
 	mask = (mask & ~MASK_SHIFT);
 	mask = (mask & ~MASK_CONTROL);
 
@@ -547,8 +547,8 @@ LLToolCompGun::~LLToolCompGun()
 
 BOOL LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)
 {
-	// HACK to make mouselook kick in again after item selected
-	// from context menu
+	// *NOTE: This hack is here to make mouselook kick in again after
+	// item selected from context menu.
 	if ( mCur == mNull && !gPopupMenuView->getVisible() )
 	{
 		gSelectMgr->deselectAll();
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index dcfcd03a68..f1995ce05a 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1555,7 +1555,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
 	hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
 	if (gFloaterTools->getVisible())
 	{
-		//FIXME: only show this if panel not expanded?
+		// *FIX: only show this if panel not expanded?
 		gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
 	}
 
@@ -2663,7 +2663,8 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventoryObject(
 		{
 			giveInventory(obj->getID(), item );
 		}
-		//FIXME: deal with all the issues surrounding multi-object inventory transfers
+		// *TODO: deal with all the issues surrounding multi-object
+		// inventory transfers.
 		return ACCEPT_YES_SINGLE;
 	}
 	return ACCEPT_NO;
@@ -2688,7 +2689,8 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventory(
 	{
 		giveInventory(obj->getID(), item);
 	}
-	//FIXME: deal with all the issues surrounding multi-object inventory transfers
+	// *TODO: deal with all the issues surrounding multi-object
+	// inventory transfers.
 	return ACCEPT_YES_SINGLE;
 }
 
@@ -2704,7 +2706,8 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventoryCategory(
 		if(!cat) return ACCEPT_NO;
 		giveInventoryCategory(obj->getID(), cat);
 	}
-	//FIXME: deal with all the issues surrounding multi-object inventory transfers
+	// *TODO: deal with all the issues surrounding multi-object
+	// inventory transfers.
 	return ACCEPT_YES_SINGLE;
 }
 
diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp
index 8d4d58f40c..f77c4aa1ce 100755
--- a/indra/newview/lltoolpipette.cpp
+++ b/indra/newview/lltoolpipette.cpp
@@ -57,7 +57,7 @@ BOOL LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	mSuccess = TRUE;
 	gSelectMgr->unhighlightAll();
-	//FIXME: this assumes the pipette tool is a transient tool
+	// *NOTE: This assumes the pipette tool is a transient tool.
 	gToolMgr->clearTransientTool();
 	setMouseCapture(FALSE);
 	return TRUE;
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 532f75c3e7..483f179684 100755
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -7,6 +7,9 @@
  */
 
 // A tool to pick texture entry infro from objects in world (color/texture)
+// This tool assumes it is transient in the codebase and must be used
+// accordingly. We should probably restructure the way tools are
+// managed so that this is handled automatically.
 
 #ifndef LL_LLTOOLPIPETTE_H
 #define LL_LLTOOLPIPETTE_H
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index d027f7dd54..3a38ba52ee 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -438,7 +438,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
 		display_update_camera();
 		stop_glerror();
 		
-		//FIXME: merge these two methods
+		// *TODO: merge these two methods
 		gHUDManager->updateEffects();
 		LLHUDObject::updateAll();
 		stop_glerror();
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index a8fd7b9d90..4ae527eee5 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -337,7 +337,7 @@ void LLViewerJointAttachment::clampObjectPosition()
 {
 	if (mAttachedObject)
 	{
-		//FIXME: object can drift when hitting maximum radius
+		// *NOTE: object can drift when hitting maximum radius
 		LLVector3 attachmentPos = mAttachedObject->getPosition();
 		F32 dist = attachmentPos.normVec();
 		dist = llmin(dist, MAX_ATTACHMENT_DIST);
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 23abba1c9f..aec15a8d6c 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -906,7 +906,7 @@ void llDrawElementsBatchBlend(const U32 vert_offset, const U32 vert_count, LLFac
 		o_texcoords0= (LLVector2*)(gAGPVertices + AVATAR_OFFSET_TEX0);		o_texcoords0.setStride(AVATAR_VERTEX_BYTES);
 		o_texcoords1= (LLVector2*)(gAGPVertices + AVATAR_OFFSET_TEX1);		o_texcoords1.setStride(AVATAR_VERTEX_BYTES);
 
-#if !LL_LINUX // !!! FIXME
+#if !LL_LINUX // !!! *TODO: do the linux implementation
 		if (gGLManager.mSoftwareBlendSSE)
 		{
 			// do SSE blend without binormals or extra texcoords
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1bf279bf2b..8eae25fa63 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1603,7 +1603,9 @@ class LLObjectTouch : public view_listener_t
 		msg->addVector3Fast(_PREHASH_GrabOffset, LLVector3::zero );
 		msg->sendMessage( object->getRegion()->getHost());
 
-		// HACK: Hope the packets arrive safely and in order.
+		// *NOTE: Hope the packets arrive safely and in order or else
+		// there will be some problems.
+		// *TODO: Just fix this bad assumption.
 		msg->newMessageFast(_PREHASH_ObjectDeGrab);
 		msg->nextBlockFast(_PREHASH_AgentData);
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -1627,7 +1629,7 @@ class LLObjectEnableTouch : public view_listener_t
 		bool new_value = obj && obj->flagHandleTouch();
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
-		// HACK Update label
+		// Update label based on the node touch name if available.
 		LLSelectNode* node = gSelectMgr->getFirstRootNode();
 		if (node && node->mValid && !node->mTouchName.empty())
 		{
@@ -3535,9 +3537,8 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
 		if(!object || !node->mValid) continue;
 		if(object->getRegion() != region)
 		{
-			// *FIX: This doesn't work at all if the some of the
-			// objects are in regions besides the first object
-			// selected. We should really support this.
+			// Derez doesn't work at all if the some of the objects
+			// are in regions besides the first object selected.
 
 			// ...crosses region boundaries
 			error = "AcquireErrorObjectSpan";
@@ -4307,7 +4308,7 @@ class LLToolsEnableBuyOrTake : public view_listener_t
 		bool new_value = is_buy ? enable_buy(NULL) : enable_take();
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
-		// HACK: Update label
+		// Update label
 		LLString label;
 		LLString buy_text;
 		LLString take_text;
@@ -4497,7 +4498,7 @@ class LLToolsSaveToObjectInventory : public view_listener_t
 			LLSelectNode* node = gSelectMgr->getFirstRootNode();
 			if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
 			{
-				// *FIX: check to see if the fromtaskid object exists.
+				// *TODO: check to see if the fromtaskid object exists.
 				derez_objects(DRD_SAVE_INTO_TASK_INVENTORY, node->mFromTaskID);
 			}
 		}
@@ -4861,7 +4862,7 @@ class LLViewEnableLastChatter : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		//FIXME: add check that last chatter is in range
+		// *TODO: add check that last chatter is in range
 		bool new_value = (gAgent.cameraThirdPerson() && gAgent.getLastChatter().notNull());
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 		return true;
@@ -5862,7 +5863,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // St
 	LLUploadDialog::modalUploadFinished();
 	delete data;
 
-	// *FIX: This is a pretty big hack. What this does is check the
+	// *NOTE: This is a pretty big hack. What this does is check the
 	// file picker if there are any more pending uploads. If so,
 	// upload that file.
 	const char* next_file = LLFilePicker::instance().getNextFile();
@@ -6231,7 +6232,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
 		}
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
-		// HACK: Update label
+		// Update label
 		LLString label;
 		LLString sit_text;
 		LLString stand_text;
@@ -7751,8 +7752,7 @@ BOOL enable_save_into_task_inventory(void*)
 		LLSelectNode* node = gSelectMgr->getFirstRootNode();
 		if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
 		{
-			// *FIX: check to see if the fromtaskid object exists.
-
+			// *TODO: check to see if the fromtaskid object exists.
 			LLViewerObject* obj = node->getObject();
 			if( obj && !obj->isAttachment() )
 			{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c649229311..994a2a4659 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2483,7 +2483,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 	llinfos << "process_agent_movement_complete()" << llendl;
 
-	// *FIX: check timestamp.
+	// *TODO: check timestamp to make sure the movement compleation
+	// makes sense.
 	LLVector3 agent_pos;
 	msg->getVector3Fast(_PREHASH_Data, _PREHASH_Position, agent_pos);
 	LLVector3 look_at;
@@ -2876,7 +2877,8 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 
 
 
-// TODO: FIX this dependency
+// *TODO: Remove this dependency, or figure out a better way to handle
+// this hack.
 extern U32 gObjectBits;
 
 void process_object_update(LLMessageSystem *mesgsys, void **user_data)
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b1e4ee1947..2d97c6f2a4 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2000,7 +2000,7 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 			// 
 			// There is a problem here if dt is negative. . .
 
-			//FIXME: should also wrap linear accel/velocity in check
+			// *TODO: should also wrap linear accel/velocity in check
 			// to see if object is selected, instead of explicitly
 			// zeroing it out	
 			LLVector3 accel = getAcceleration();
@@ -3133,7 +3133,8 @@ void LLViewerObject::setPositionGlobal(const LLVector3d &pos_global, BOOL damped
 			
 			delta_pos = delta_pos * invRotation;
 
-			//FIXME: is this right?  Shouldn't we be calling the LLViewerObject version of setPosition?
+			// *FIX: is this right?  Shouldn't we be calling the
+			// LLViewerObject version of setPosition?
 			LLVector3 old_pos = mDrawable->mXform.getParent()->getPosition();
 			mDrawable->mXform.getParent()->setPosition(old_pos + delta_pos);
 			setChanged(TRANSLATED | SILHOUETTE);
@@ -3900,7 +3901,7 @@ void LLViewerObject::setIcon(LLViewerImage* icon_image)
 		mIcon = (LLHUDIcon *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_ICON);
 		mIcon->setSourceObject(this);
 		mIcon->setImage(icon_image);
-		//FIXME: make this user configurable
+		// *TODO: make this user configurable
 		mIcon->setScale(0.03f);
 	}
 	else
@@ -4573,7 +4574,7 @@ LLViewerObject::LLInventoryCallbackInfo::~LLInventoryCallbackInfo()
 
 void LLViewerObject::updateVolume(const LLVolumeParams& volume_params)
 {
-	if (setVolume(volume_params, 1)) // FIXME: magic number, ack!
+	if (setVolume(volume_params, 1)) // *FIX: magic number, ack!
 	{
 		// Transmit the update to the simulator
 		sendShapeUpdate();
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 2b3c364454..8e7edab927 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -2268,7 +2268,7 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const
 		= parcel->getReservedForNewbie()
 			? (!forGroup && gStatusBar->getSquareMetersCommitted() == 0)
 			: true;
-		//FIXME: should be based on never_owned_land, see SL-10728
+		// *TODO: should be based on never_owned_land, see SL-10728
 		
 	bool isAuthorized
 		= (authorizeBuyer.isNull() || (gAgent.getID() == authorizeBuyer));
@@ -2537,7 +2537,7 @@ BOOL LLViewerParcelMgr::isParcelModifiableByAgent(const LLParcel* parcelp, U64 g
 	BOOL rv = FALSE;
 	if (parcelp)
 	{
-		// *FIX: This should only work for leased parcels, but group owned
+		// *NOTE: This should only work for leased parcels, but group owned
 		// parcels cannot be OS_LEASED yet. Phoenix 2003-12-15.
 		rv = isParcelOwnedByAgent(parcelp, group_proxy_power);
 
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index ddbf577f0a..16ba5d29ea 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -628,8 +628,6 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 				startSelection();
 			}
 			gFocusMgr.setMouseCapture( this, &LLTextEditor::onMouseCaptureLost );
-			//FIXME:
-			//gViewerWindow->requestFastFrame(this);
 		}
 
 		handled = TRUE;
@@ -667,8 +665,6 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
 				{
 					mLastSelectionX = x;
 					mLastSelectionY = y;
-					//FIXME:
-					//gViewerWindow->requestFastFrame(this);
 				}
 
 				if( y > mTextRect.mTop )
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 3836b2d1d7..ea73a969d6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -688,7 +688,8 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 		}
 	}
 
-	//FIXME: this should be rolled into the composite tool logic, not hardcoded at the top level
+	// *HACK: this should be rolled into the composite tool logic, not
+	// hardcoded at the top level.
 	if (gToolPie && (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode()) )
 	{
 		// If the current tool didn't process the click, we should show
@@ -921,9 +922,10 @@ BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key,  MASK mask, BOOL repeated)
 		gAgent.clearAFK();
 	}
 
-	// HACK: We want to interpret KEY_RETURN later when it arrives as a Unicode char,
-	// not as a keydown.  Otherwise when client frame rate is really low, hitting
-	// return sends your chat text before it's all entered/processed.
+	// *NOTE: We want to interpret KEY_RETURN later when it arrives as
+	// a Unicode char, not as a keydown.  Otherwise when client frame
+	// rate is really low, hitting return sends your chat text before
+	// it's all entered/processed.
 	if (key == KEY_RETURN && mask == MASK_NONE)
 	{
 		return FALSE;
@@ -1583,7 +1585,6 @@ void LLViewerWindow::initWorldUI()
 	gFloaterTools->setVisible(FALSE);
 
 	// Status bar
-	//FIXME change this back
 	S32 menu_bar_height = gMenuBarView->getRect().getHeight();
 	LLRect root_rect = gViewerWindow->getRootView()->getRect();
 	LLRect status_rect(0, root_rect.getHeight(), root_rect.getWidth(), root_rect.getHeight() - menu_bar_height);
@@ -2023,7 +2024,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 		{
 			return TRUE;
 		}
-		//FIXME: get this to play well with mouselook and hidden cursor modes, etc.
+
+		// *TODO: get this to play well with mouselook and hidden
+		// cursor modes, etc, and re-enable.
 		//if (gFocusMgr.getMouseCapture())
 		//{
 		//	gFocusMgr.setMouseCapture(NULL, NULL);
@@ -2091,7 +2094,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 	}
 
 	// Topmost view gets a chance before the hierarchy
-	//FIXME: get rid of this?
+	// *FIX: get rid of this?
 	LLView* top_view = gFocusMgr.getTopView();
 	if (top_view)
 	{
@@ -2420,7 +2423,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		}
 	}
 
-	//FIXME: sometimes tools handle the mouse as a captor, so this
+	// *NOTE: sometimes tools handle the mouse as a captor, so this
 	// logic is a little confusing
 	LLTool *tool = NULL;
 	if (gToolMgr && gHoverView)
@@ -2586,7 +2589,8 @@ BOOL LLViewerWindow::handlePerFrameHover()
 			if (!gToolBar->getVisible()
 				&& !gChatBar->getVisible())
 			{
-				// FIXME: this is highly depenent on the XML describing the position of the buttons
+				// *NOTE: this is highly depenent on the XML
+				// describing the position of the buttons
 				overlay_rect.translate(0, 0);
 			}
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index acec80c95a..d1e4de5478 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2432,8 +2432,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 		return TRUE;
 	}
 
-	// HACK!!!!
-	// this is necessary for the floating name text above your head
+	// *NOTE: this is necessary for the floating name text above your head.
 	if (mDrawable.notNull())
 	{
 		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
@@ -2829,7 +2828,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 					}
 					else if (chat_fade_amt < 3.f)
 					{
-						//FIXME: only remove lines down to minimum number
+						// *NOTE: only remove lines down to minimum number
 						mNameText->addLine(utf8str_to_wstring(chat_iter->mText), old_chat, style);
 					}
 				}
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index 1c819ebcd8..c140e97e5e 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -46,7 +46,10 @@ const F32 fsigma	= (6+3*sigma)/(6.f-7.f*sigma);
 const F64 Ndens		= 2.55e25;
 const F64 Ndens2	= Ndens*Ndens;
 
-// !!! FIXME: This #define should be in llcommon somewhere...
+// !!! *FIX: This #define should be in llcommon somewhere...
+// We should not be #defining anything with leading underscores and
+// much less double leading underscores since that is always vendor
+// specific. Change this to something like LL_FORCE_INLINE.
 #ifdef __GNUC__
 #define __forceinline inline __attribute__((always_inline))
 #endif
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 03074d8a73..fc4079f3d2 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1768,9 +1768,9 @@ BOOL LLVOVolume::isAttachment() const
 
 BOOL LLVOVolume::isHUDAttachment() const
 {
-	//HACK assume hud attachment points are in defined range
-	// since this range is constant for backwards compatibility reasons
-	// this is probably a reasonable assumption to make
+	// *NOTE: we assume hud attachment points are in defined range
+	// since this range is constant for backwards compatibility
+	// reasons this is probably a reasonable assumption to make
 	S32 attachment_id = ATTACHMENT_ID_FROM_STATE(mState);
 	return ( attachment_id >= 31 && attachment_id <= 38 );
 }
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 56e496e303..78e47dbf83 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -1494,7 +1494,10 @@ void LLWorldMapView::drawTrackingArrow(const LLRect& rect, S32 x, S32 y,
 		y_clamped = llclamp( y_clamped, 0.f, (F32)(rect.getHeight() - arrow_size) );
 	}
 
-	//FIXME: deal with non-square window properly
+	// *FIX: deal with non-square window properly.
+	// I do not understand what this comment means -- is it actually
+	// broken or is it correctly dealing with non-square
+	// windows. Phoenix 2007-01-03.
 	S32 half_arrow_size = (S32) (0.5f * arrow_size);
 
 	F32 angle = atan2( y + half_arrow_size - y_center, x + half_arrow_size - x_center);