Merged default

--HG--
branch : client_config_qt

code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h

@@ -128,7 +128,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMinValue(void) const
 		{
 			uint32 lhs = _Arg[0]->getMinValue();
 			uint32 rhs = _Arg[1]->getMaxValue();
-			return rhs > rhs ? 0 : lhs - rhs;
+			return lhs > rhs ? 0 : lhs - rhs;
 		}
 		break;
 		default:
@@ -153,7 +153,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMaxValue(void) const
 		{
 			uint32 lhs = _Arg[0]->getMaxValue();
 			uint32 rhs = _Arg[1]->getMinValue();
-			return rhs > rhs ? 0 : lhs - rhs;
+			return lhs > rhs ? 0 : lhs - rhs;
 		}
 		break;
 		default:

code/nel/src/misc/sheet_id.cpp

@@ -168,12 +168,15 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
 				_Id.IdInfos.Type = typeId;
 				_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
 				_DevSheetNameToId[unknownNewType] = _Id.Id;
+				if (sheetName == "unknown")
+					return true; // Return with the unknown sheet id of this type
 			}
 			else
 			{
 				typeId = tit->second;
 				_Id.IdInfos.Type = typeId;
 			}
+			// Add a new sheet name to the type
 			_DevSheetIdToName[typeId].push_back(sheetNameLc);
 			_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
 			// nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id);

code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp

@@ -84,7 +84,7 @@ namespace GUIEditor
 		CInterfaceGroup *mg = CWidgetManager::getInstance()->getMasterGroupFromId( masterGroup );
 		if( mg != NULL )
 		{
-			QTreeWidgetItem *item = new QTreeWidgetItem( NULL );
+			QTreeWidgetItem *item = new QTreeWidgetItem( static_cast<QTreeWidgetItem*>(NULL) );
 			item->setText( 0, "ui" );
 			widgetHT->addTopLevelItem( item );