7 files changed, 19 insertions, 15 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 84c5d354be..d64abfe698 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -202,8 +202,9 @@ void LLComboBox::setEnabled(BOOL enabled)
 	mButton->setEnabled(enabled);
 }
 
-//FIXME: these are all hacks to support the fact that the combobox has mouse capture
-// so we can hide the list when we don't handle the mouse up event
+// *HACK: these are all hacks to support the fact that the combobox
+// has mouse capture so we can hide the list when we don't handle the
+// mouse up event
 BOOL LLComboBox::handleHover(S32 x, S32 y, MASK mask)
 {
 	if (mList->getVisible())
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 3f9139fe86..0e5d37d93e 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -887,7 +887,7 @@ void LLFloater::setFocus( BOOL b )
 			last_focus->isInEnabledChain() &&
 			last_focus->isInVisibleChain())
 		{
-			// FIXME: should handle case where focus doesn't stick
+			// *FIX: should handle case where focus doesn't stick
 			last_focus->setFocus(TRUE);
 		}
 	}
@@ -1716,7 +1716,7 @@ void LLFloaterView::restoreAll()
 		floaterp->setMinimized(FALSE);
 	}
 
-	//FIXME: make sure dependents are restored
+	// *FIX: make sure dependents are restored
 
 	// children then deleted by default view constructor
 }
@@ -1861,7 +1861,8 @@ BOOL LLFloaterView::getCycleMode()
 
 void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus)
 {
-	//FIXME: make this respect floater's mAutoFocus value, instead of using parameter
+	// *TODO: make this respect floater's mAutoFocus value, instead of
+	// using parameter
 	if (child->getHost())
  	{
 		// this floater is hosted elsewhere and hence not one of our children, abort
@@ -2690,7 +2691,7 @@ void LLMultiFloater::tabClose()
 
 void LLMultiFloater::setVisible(BOOL visible)
 {
-	//FIXME: shouldn't have to do this, fix adding to minimized multifloater
+	// *FIX: shouldn't have to do this, fix adding to minimized multifloater
 	LLFloater::setVisible(visible);
 	
 	if (mTabContainer)
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index de06c34c44..f8fcefd11d 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -216,7 +216,9 @@ BOOL LLMenuItemGL::addToAcceleratorList(std::list <LLKeyBinding*> *listp)
 			accelerator = *list_it;
 			if ((accelerator->mKey == mAcceleratorKey) && (accelerator->mMask == mAcceleratorMask))
 			{
-			//FIXME: get calling code to throw up warning or route warning messages back to app-provided output
+
+			// *NOTE: get calling code to throw up warning or route
+			// warning messages back to app-provided output
 			//	LLString warning;
 			//	warning.append("Duplicate key binding <");
 			//	appendAcceleratorString( warning );
@@ -1542,7 +1544,7 @@ void LLMenuItemBranchDownGL::doIt( void )
 			}
 			mBranch->translate( delta_x, 0 );
 
-			//FIXME: get menuholder lookup working more generically
+			// *TODO: get menuholder lookup working more generically
 			// hide existing menus
 			if (!mBranch->getTornOff())
 			{
@@ -2183,7 +2185,7 @@ void LLMenuGL::arrange( void )
 	{
 		U32 max_width = (getParent() != NULL) ? getParent()->getRect().getWidth() : U32_MAX;
 		U32 max_height = (getParent() != NULL) ? getParent()->getRect().getHeight() : U32_MAX;
-		//FIXME: create the item first and then ask for its dimensions?
+		// *FIX: create the item first and then ask for its dimensions?
 		S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::sSansSerif->getWidth( "More" );
 		S32 spillover_item_height = llround(LLFontGL::sSansSerif->getLineHeight()) + MENU_ITEM_PADDING;
 
@@ -3407,7 +3409,7 @@ BOOL LLPieMenu::handleMouseUp( S32 x, S32 y, MASK mask )
 		mFirstMouseDown = FALSE;
 	}
 	
-	//FIXME: is this necessary?
+	// *FIX: is this necessary?
 	if (!mShrinkBorderTimer.getStarted())
 	{
 		mShrinkBorderTimer.start();
@@ -3766,7 +3768,7 @@ void LLPieMenu::show(S32 x, S32 y, BOOL mouse_down)
 		LLUI::setCursorPositionLocal(getParent(), center.mX, center.mY);
 	}
 
-	// FIXME: what happens when mouse buttons reversed?
+	// *FIX: what happens when mouse buttons reversed?
 	mRightMouseDown = mouse_down;
 	mFirstMouseDown = mouse_down;
 	mUseInfiniteRadius = TRUE;
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 84cbf13b69..7dcd950996 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -714,7 +714,7 @@ protected:
 };
 
 
-//FIXME: this is currently working, so finish implementation
+// *TODO: this is currently working, so finish implementation
 class LLEditMenuHandlerMgr
 {
 public:
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp
index 0183c58c93..c6bc7fb355 100644
--- a/indra/llui/llresizebar.cpp
+++ b/indra/llui/llresizebar.cpp
@@ -110,7 +110,7 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask)
 	// We only handle the click if the click both started and ended within us
 	if( gFocusMgr.getMouseCapture() == this )
 	{
-		//FIXME: this, of course, is fragile
+		// *NOTE: this, of course, is fragile
 		LLView* floater_view = getParent()->getParent();
 		S32 floater_view_x;
 		S32 floater_view_y;
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index fd85dbb2f4..9c356f9524 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -846,7 +846,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 
 	if (placeholder)
 	{
-		//FIXME: wont work for horizontal tabs
+		// *FIX: wont work for horizontal tabs
 		btn_rect.translate(0, -LLBUTTON_V_PAD-2);
 		LLString box_label = trimmed_label;
 		LLTextBox* text = new LLTextBox(box_label, btn_rect, box_label, font);
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index f8d1504f3c..6323a408bb 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1543,7 +1543,7 @@ LLRect LLView::getRequiredRect()
 
 const LLRect LLView::getScreenRect() const
 {
-	//FIXME: check for one-off error
+	// *FIX: check for one-off error
 	LLRect screen_rect;
 	localPointToScreen(0, 0, &screen_rect.mLeft, &screen_rect.mBottom);
 	localPointToScreen(mRect.getWidth(), mRect.getHeight(), &screen_rect.mRight, &screen_rect.mTop);