Merge with develop

--HG--
branch : atys

code/ryzom/client/src/client_cfg.cpp

@@ -614,6 +614,8 @@ CClientConfig::CClientConfig()
 	MaxMapScale			= 2.0f;
 	R2EDMaxMapScale		= 8.0f;
 
+	TargetChangeCompass	= true;
+
 	// VERBOSES
 	VerboseVP				= false;
 	VerboseAnimUser			= false;
@@ -1495,6 +1497,9 @@ void CClientConfig::setValues()
 	READ_FLOAT_FV(MaxMapScale);
 	READ_FLOAT_FV(R2EDMaxMapScale);
 
+	// /tar to update compass or not
+	READ_BOOL_FV(TargetChangeCompass);
+
 	/////////////
 	// SHADOWS //
 	// Shadows : Get Shadows state

code/ryzom/client/src/client_cfg.h

@@ -607,6 +607,9 @@ struct CClientConfig
 	float			MaxMapScale;
 	float			R2EDMaxMapScale;
 
+	// If successfull /tar command should set compass or not
+	bool			TargetChangeCompass;
+
 	//////////////
 	// VERBOSES //
 	bool			VerboseVP;

code/ryzom/client/src/interface_v3/action_handler_game.cpp

@@ -2476,16 +2476,19 @@ class CAHTarget : public IActionHandler
 		if (entity && entity->properties().selectable() && !entity->getDisplayName().empty())
 		{
 			UserEntity->selection(entity->slot());
-			CGroupCompas *gc = dynamic_cast<CGroupCompas *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:compass"));
-			if (gc)
+			if (ClientCfg.TargetChangeCompass)
 			{
-				CCompassTarget ct;
-				ct.setType(CCompassTarget::Selection);
+				CGroupCompas *gc = dynamic_cast<CGroupCompas *>(CWidgetManager::getInstance()->getElementFromId("ui:interface:compass"));
+				if (gc)
+				{
+					CCompassTarget ct;
+					ct.setType(CCompassTarget::Selection);
 
-				gc->setActive(true);
-				gc->setTarget(ct);
-				gc->blink();
-				CWidgetManager::getInstance()->setTopWindow(gc);
+					gc->setActive(true);
+					gc->setTarget(ct);
+					gc->blink();
+					CWidgetManager::getInstance()->setTopWindow(gc);
+				}
 			}
 		}
 		else if (!quiet)

code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

@@ -100,7 +100,6 @@ void CControlSheetInfoWaiter::infoReceived()
 ucstring CControlSheetInfoWaiter::infoValidated() const
 {
 	ucstring help;
-
 	if (CtrlSheet && !LuaMethodName.empty())
 	{
 		// delegate setup of context he help ( & window ) to lua
@@ -3396,6 +3395,9 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 				// call lua function to update tooltip window
 				_ItemInfoWaiter.sendRequest();
 				help = _ItemInfoWaiter.infoValidated();
+				// its expected to get at least item name back
+				if (help.empty())
+					help = getItemActualName();
 			}
 			else if (!_ContextHelp.empty())
 			{