merge

1 files changed, 13 insertions, 16 deletions

diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index 393aa188e1..a8274b3887 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -310,26 +310,23 @@ std::map<LLNotificationPtr, class LLHintPopup*> LLHints::sHints;
 //static
 void LLHints::show(LLNotificationPtr hint)
 {
-	if (gSavedSettings.getBOOL("EnableUIHints"))
-	{
-		LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>());
+	LLHintPopup::Params p(LLUICtrlFactory::getDefaultParams<LLHintPopup>());
 
-		LLParamSDParser parser;
-		parser.readSD(hint->getPayload(), p, true);
-		p.notification = hint;
+	LLParamSDParser parser;
+	parser.readSD(hint->getPayload(), p, true);
+	p.notification = hint;
 
-		if (p.validateBlock())
-		{
-			LLHintPopup* popup = new LLHintPopup(p);
+	if (p.validateBlock())
+	{
+		LLHintPopup* popup = new LLHintPopup(p);
 
-			sHints[hint] = popup;
+		sHints[hint] = popup;
 
-			LLView* hint_holder = gViewerWindow->getHintHolder();
-			if (hint_holder)
-			{
-				hint_holder->addChild(popup);
-				popup->centerWithin(hint_holder->getLocalRect());
-			}
+		LLView* hint_holder = gViewerWindow->getHintHolder();
+		if (hint_holder)
+		{
+			hint_holder->addChild(popup);
+			popup->centerWithin(hint_holder->getLocalRect());
 		}
 	}
 }