Merge branch 'master' into ConfigFileUpdate

world/worlddb.cpp

@@ -245,7 +245,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 		/* Load Inventory */
 		// If we ensure that the material data is updated appropriately, we can do away with inventory loads
 		if (GetInventory(accountID, cse->Name, &inv)) {
-			const Item_Struct* item = nullptr;
+			const EQEmu::Item_Struct* item = nullptr;
 			const ItemInst* inst = nullptr;
 			int16 invslot = 0;